File tree Expand file tree Collapse file tree 4 files changed +15
-11
lines changed Expand file tree Collapse file tree 4 files changed +15
-11
lines changed Original file line number Diff line number Diff line change 49
49
[matTooltip] ="_intl.firstPageLabel "
50
50
[matTooltipDisabled] ="_previousButtonsDisabled() "
51
51
[matTooltipPosition] ="'above' "
52
- [disabled] ="_previousButtonsDisabled() ">
52
+ [disabled] ="_previousButtonsDisabled() "
53
+ disabledInteractive >
53
54
< svg class ="mat-mdc-paginator-icon "
54
55
viewBox ="0 0 24 24 "
55
56
focusable ="false "
65
66
[matTooltip] ="_intl.previousPageLabel "
66
67
[matTooltipDisabled] ="_previousButtonsDisabled() "
67
68
[matTooltipPosition] ="'above' "
68
- [disabled] ="_previousButtonsDisabled() ">
69
+ [disabled] ="_previousButtonsDisabled() "
70
+ disabledInteractive >
69
71
< svg class ="mat-mdc-paginator-icon "
70
72
viewBox ="0 0 24 24 "
71
73
focusable ="false "
80
82
[matTooltip] ="_intl.nextPageLabel "
81
83
[matTooltipDisabled] ="_nextButtonsDisabled() "
82
84
[matTooltipPosition] ="'above' "
83
- [disabled] ="_nextButtonsDisabled() ">
85
+ [disabled] ="_nextButtonsDisabled() "
86
+ disabledInteractive >
84
87
< svg class ="mat-mdc-paginator-icon "
85
88
viewBox ="0 0 24 24 "
86
89
focusable ="false "
96
99
[matTooltip] ="_intl.lastPageLabel "
97
100
[matTooltipDisabled] ="_nextButtonsDisabled() "
98
101
[matTooltipPosition] ="'above' "
99
- [disabled] ="_nextButtonsDisabled() ">
102
+ [disabled] ="_nextButtonsDisabled() "
103
+ disabledInteractive >
100
104
< svg class ="mat-mdc-paginator-icon "
101
105
viewBox ="0 0 24 24 "
102
106
focusable ="false "
Original file line number Diff line number Diff line change @@ -119,7 +119,7 @@ $button-icon-size: 28px;
119
119
) {
120
120
@include token-utils .create-token-slot (fill , enabled- icon- color);
121
121
122
- .mat-mdc-icon-button [disabled ] & {
122
+ .mat-mdc-icon-button [aria- disabled ] & {
123
123
@include token-utils .create-token-slot (fill , disabled- icon- color);
124
124
}
125
125
}
Original file line number Diff line number Diff line change @@ -529,10 +529,10 @@ describe('MatPaginator', () => {
529
529
fixture . detectChanges ( ) ;
530
530
531
531
expect ( select . disabled ) . toBe ( true ) ;
532
- expect ( getPreviousButton ( fixture ) . hasAttribute ( 'disabled' ) ) . toBe ( true ) ;
533
- expect ( getNextButton ( fixture ) . hasAttribute ( 'disabled' ) ) . toBe ( true ) ;
534
- expect ( getFirstButton ( fixture ) . hasAttribute ( 'disabled' ) ) . toBe ( true ) ;
535
- expect ( getLastButton ( fixture ) . hasAttribute ( 'disabled' ) ) . toBe ( true ) ;
532
+ expect ( getPreviousButton ( fixture ) . hasAttribute ( 'aria- disabled' ) ) . toBe ( true ) ;
533
+ expect ( getNextButton ( fixture ) . hasAttribute ( 'aria- disabled' ) ) . toBe ( true ) ;
534
+ expect ( getFirstButton ( fixture ) . hasAttribute ( 'aria- disabled' ) ) . toBe ( true ) ;
535
+ expect ( getLastButton ( fixture ) . hasAttribute ( 'aria- disabled' ) ) . toBe ( true ) ;
536
536
} ) ;
537
537
538
538
it ( 'should be able to configure the default options via a provider' , ( ) => {
Original file line number Diff line number Diff line change @@ -50,13 +50,13 @@ export class MatPaginatorHarness extends ComponentHarness {
50
50
51
51
/** Returns whether or not the next page button is disabled. */
52
52
async isNextPageDisabled ( ) : Promise < boolean > {
53
- const disabledValue = await ( await this . _nextButton ( ) ) . getAttribute ( 'disabled' ) ;
53
+ const disabledValue = await ( await this . _nextButton ( ) ) . getAttribute ( 'aria- disabled' ) ;
54
54
return disabledValue == 'true' ;
55
55
}
56
56
57
57
/* Returns whether or not the previous page button is disabled. */
58
58
async isPreviousPageDisabled ( ) : Promise < boolean > {
59
- const disabledValue = await ( await this . _previousButton ( ) ) . getAttribute ( 'disabled' ) ;
59
+ const disabledValue = await ( await this . _previousButton ( ) ) . getAttribute ( 'aria- disabled' ) ;
60
60
return disabledValue == 'true' ;
61
61
}
62
62
You can’t perform that action at this time.
0 commit comments