@@ -124,13 +124,11 @@ export class IgxMonthPickerComponent extends IgxMonthPickerBaseDirective {
124
124
super . activeViewDecadeKB ( event ) ;
125
125
126
126
if ( event . key === KEYS . RIGHT_ARROW || event . key === KEYS . RIGHT_ARROW_IE ) {
127
- event . preventDefault ( ) ;
128
- this . nextYear ( ) ;
127
+ this . nextYear ( event ) ;
129
128
}
130
129
131
130
if ( event . key === KEYS . LEFT_ARROW || event . key === KEYS . LEFT_ARROW_IE ) {
132
- event . preventDefault ( ) ;
133
- this . previousYear ( ) ;
131
+ this . previousYear ( event ) ;
134
132
}
135
133
136
134
requestAnimationFrame ( ( ) => {
@@ -152,48 +150,10 @@ export class IgxMonthPickerComponent extends IgxMonthPickerBaseDirective {
152
150
/**
153
151
* @hidden
154
152
*/
155
- public nextYear ( ) {
156
- this . yearAction = 'next' ;
157
- this . previousViewDate = this . viewDate ;
158
- this . viewDate = this . calendarModel . getNextYear ( this . viewDate ) ;
159
-
160
- this . selectDate ( this . viewDate ) ;
161
- this . onSelection . emit ( this . selectedDates ) ;
162
- }
163
-
164
- /**
165
- * @hidden
166
- */
167
- public nextYearKB ( event ) {
168
- if ( event . key === KEYS . SPACE || event . key === KEYS . SPACE_IE || event . key === KEYS . ENTER ) {
169
- event . preventDefault ( ) ;
170
- event . stopPropagation ( ) ;
171
-
172
- this . nextYear ( ) ;
173
- }
174
- }
175
-
176
- /**
177
- * @hidden
178
- */
179
- public previousYear ( ) {
180
- this . yearAction = 'prev' ;
181
- this . previousViewDate = this . viewDate ;
182
- this . viewDate = this . calendarModel . getPrevYear ( this . viewDate ) ;
183
-
184
- this . selectDate ( this . viewDate ) ;
185
- this . onSelection . emit ( this . selectedDates ) ;
186
- }
187
-
188
- /**
189
- * @hidden
190
- */
191
- public previousYearKB ( event ) {
153
+ public changeYearKB ( event , next = true ) {
192
154
if ( event . key === KEYS . SPACE || event . key === KEYS . SPACE_IE || event . key === KEYS . ENTER ) {
193
- event . preventDefault ( ) ;
194
155
event . stopPropagation ( ) ;
195
-
196
- this . previousYear ( ) ;
156
+ next ? this . nextYear ( event ) : this . previousYear ( event ) ;
197
157
}
198
158
}
199
159
@@ -252,8 +212,8 @@ export class IgxMonthPickerComponent extends IgxMonthPickerBaseDirective {
252
212
* @hidden
253
213
*/
254
214
@HostListener ( 'keydown.pageup' , [ '$event' ] )
255
- public onKeydownPageUp ( event : KeyboardEvent ) {
256
- event . preventDefault ( ) ;
215
+ public previousYear ( event ? : KeyboardEvent ) {
216
+ event ? .preventDefault ( ) ;
257
217
this . yearAction = 'prev' ;
258
218
this . previousViewDate = this . viewDate ;
259
219
this . viewDate = this . calendarModel . getPrevYear ( this . viewDate ) ;
@@ -263,8 +223,8 @@ export class IgxMonthPickerComponent extends IgxMonthPickerBaseDirective {
263
223
* @hidden
264
224
*/
265
225
@HostListener ( 'keydown.pagedown' , [ '$event' ] )
266
- public onKeydownPageDown ( event : KeyboardEvent ) {
267
- event . preventDefault ( ) ;
226
+ public nextYear ( event ? : KeyboardEvent ) {
227
+ event ? .preventDefault ( ) ;
268
228
this . yearAction = 'next' ;
269
229
this . previousViewDate = this . viewDate ;
270
230
this . viewDate = this . calendarModel . getNextYear ( this . viewDate ) ;
0 commit comments