@progress/kendo-angular-dateinputs 5.3.0 → 5.3.1-dev.202201070925

package/dist/es2015/calendar/calendar.component.js

@@ -11,6 +11,7 @@ import { cloneDate, isEqual } from '@progress/kendo-date-math';
 import { hasObservers, KendoInput, guid, Keys } from '@progress/kendo-angular-common';
 import { validatePackage } from '@progress/kendo-licensing';
 import { packageMetadata } from '../package-metadata';
+import { MultiViewCalendarComponent } from './multiview-calendar.component';
 import { NavigationComponent } from './navigation.component';
 import { ViewListComponent } from './view-list.component';
 import { CalendarDOMService } from './services/dom.service';
@@ -372,14 +373,13 @@ let CalendarComponent = class CalendarComponent {
     get widgetId() {
         return this.id;
     }
-    get widgetRole() {
-        return 'grid';
-    }
     get calendarTabIndex() {
+        // in Classic mode, the inner MultiViewCalendar is the focusable element
         return this.disabled || this.type === 'classic' ? undefined : this.tabIndex;
     }
     get ariaDisabled() {
-        return this.disabled;
+        // in Classic mode, the inner MultiViewCalendar should handle the disabled class and aria attr
+        return this.type === 'classic' ? undefined : this.disabled;
     }
     ngOnInit() {
         this.dom.calculateHeights(this.element.nativeElement);
@@ -458,19 +458,23 @@ let CalendarComponent = class CalendarComponent {
      * ```
      */
     focus() {
-        if (!this.element) {
-            return;
+        const focusTarget = this.type === 'infinite' ?
+            this.element && this.element.nativeElement :
+            this.multiViewCalendar;
+        if (isPresent(focusTarget)) {
+            focusTarget.focus();
         }
-        this.element.nativeElement.focus();
     }
     /**
      * Blurs the Calendar component.
      */
     blur() {
-        if (!this.element) {
-            return;
+        const blurTarget = this.type === 'infinite' ?
+            this.element && this.element.nativeElement :
+            this.multiViewCalendar;
+        if (isPresent(blurTarget)) {
+            blurTarget.blur();
         }
-        this.element.nativeElement.blur();
     }
     /**
      * @hidden
@@ -596,6 +600,14 @@ let CalendarComponent = class CalendarComponent {
                 return null;
         }
     }
+    /**
+     * @hidden
+     */
+    handleNavigate(event) {
+        this.focusedDate = event.focusedDate;
+        this.activeView = event.activeView;
+        this.emitNavigate(this.focusedDate);
+    }
     /**
      * @hidden
      */
@@ -648,6 +660,38 @@ let CalendarComponent = class CalendarComponent {
             });
         });
     }
+    /**
+     * @hidden
+     */
+    handleBlur(args) {
+        if (this.element.nativeElement.contains(args.relatedTarget)) {
+            return;
+        }
+        this.isActive = false;
+        // the injector can get the NgControl instance of the parent component (for example, the DateTimePicker)
+        // and enters the zone for no reason because the parent component is still untouched
+        if (!this.pickerService && requiresZoneOnBlur(this.control)) {
+            this.ngZone.run(() => {
+                this.onControlTouched();
+                this.emitBlur(args);
+                this.cdr.markForCheck();
+            });
+        }
+        else {
+            this.emitBlur(args);
+            this.detectChanges();
+        }
+    }
+    /**
+     * @hidden
+     */
+    handleFocus() {
+        this.isActive = true;
+        if (!NgZone.isInAngularZone()) {
+            this.detectChanges();
+        }
+        this.emitFocus();
+    }
     setClasses(element) {
         this.renderer.addClass(element, 'k-widget');
         this.renderer.addClass(element, 'k-calendar');
@@ -692,29 +736,6 @@ let CalendarComponent = class CalendarComponent {
             this.pickerService.onFocus.emit();
         }
     }
-    handleBlur(args) {
-        this.isActive = false;
-        // the injector can get the NgControl instance of the parent component (for example, the DateTimePicker)
-        // and enters the zone for no reason because the parent component is still untouched
-        if (!this.pickerService && requiresZoneOnBlur(this.control)) {
-            this.ngZone.run(() => {
-                this.onControlTouched();
-                this.emitBlur(args);
-                this.cdr.markForCheck();
-            });
-        }
-        else {
-            this.emitBlur(args);
-            this.detectChanges();
-        }
-    }
-    handleFocus() {
-        this.isActive = true;
-        if (!NgZone.isInAngularZone()) {
-            this.detectChanges();
-        }
-        this.emitFocus();
-    }
     handleComponentClick() {
         if (!this.isActive) {
             if (this.type === 'infinite' && this.monthView.isScrolled()) {
@@ -725,6 +746,10 @@ let CalendarComponent = class CalendarComponent {
         }
     }
     handleKeydown(args) {
+        const headerActive = this.type === 'classic' && this.multiViewCalendar.isHeaderActive;
+        if (headerActive) {
+            return;
+        }
         // reserve the alt + arrow key commands for the picker
         const arrowKeyPressed = [Keys.ArrowUp, Keys.ArrowRight, Keys.ArrowDown, Keys.ArrowLeft].indexOf(args.keyCode) !== -1;
         if (isPresent(this.pickerService) && arrowKeyPressed && args.altKey) {
@@ -751,7 +776,12 @@ let CalendarComponent = class CalendarComponent {
         }
     }
     setAriaActivedescendant() {
-        if (!isPresent(this.element)) {
+        // in Classic mode, the inner MultiViewCalendar handles the activedescendant
+        if (!isPresent(this.element) || (this.type === 'classic' && !this.element.nativeElement.hasAttribute('aria-activedescendant'))) {
+            return;
+        }
+        if (this.type === 'classic') {
+            this.renderer.removeAttribute(this.element.nativeElement, 'aria-activedescendant');
             return;
         }
         const focusedCellId = this.cellUID + this.focusedDate.getTime();
@@ -953,16 +983,15 @@ tslib_1.__decorate([
     ViewChild(ViewListComponent, { static: false }),
     tslib_1.__metadata("design:type", ViewListComponent)
 ], CalendarComponent.prototype, "monthView", void 0);
+tslib_1.__decorate([
+    ViewChild(MultiViewCalendarComponent, { static: false }),
+    tslib_1.__metadata("design:type", MultiViewCalendarComponent)
+], CalendarComponent.prototype, "multiViewCalendar", void 0);
 tslib_1.__decorate([
     HostBinding('attr.id'),
     tslib_1.__metadata("design:type", String),
     tslib_1.__metadata("design:paramtypes", [])
 ], CalendarComponent.prototype, "widgetId", null);
-tslib_1.__decorate([
-    HostBinding('attr.role'),
-    tslib_1.__metadata("design:type", String),
-    tslib_1.__metadata("design:paramtypes", [])
-], CalendarComponent.prototype, "widgetRole", null);
 tslib_1.__decorate([
     HostBinding('attr.tabindex'),
     tslib_1.__metadata("design:type", Number),
@@ -1066,8 +1095,10 @@ CalendarComponent = tslib_1.__decorate([
             [value]="value"
             [disabledDates]="disabledDates"
             (activeViewChange)="handleActiveViewChange($event)"
-            (navigate)="navigate.emit($event)"
+            (navigate)="handleNavigate($event)"
             (valueChange)="handleMultiViewCalendarValueChange($event, multiviewcalendar.focusedDate)"
+            (focus)="handleFocus()"
+            (blur)="handleBlur($event)"
         >
             <kendo-multiviewcalendar-messages
                 [today]="localization.get('today')"

package/dist/es2015/calendar/horizontal-view-list.component.js

@@ -332,6 +332,7 @@ HorizontalViewListComponent = tslib_1.__decorate([
         template: `
         <ng-template #tableTemplate let-date="date" let-class="className">
             <table
+                role="grid"
                 class="k-content k-calendar-content k-calendar-table"
                 [ngClass]="class"
             >

package/dist/es2015/calendar/multiview-calendar.component.d.ts

@@ -24,6 +24,7 @@ import { CalendarViewEnum } from './models/view.enum';
 import { SelectionRangeEnd } from './models/selection-range-end.type';
 import { SelectionRange } from './models/selection-range.interface';
 import { CalendarSelection } from './models/selection';
+import { PickerService } from '../common/picker.service';
 /**
  * @hidden
  */
@@ -55,6 +56,7 @@ export declare class MultiViewCalendarComponent implements AfterViewInit, Contro
     private zone;
     private disabledDatesService;
     private selectionService;
+    private pickerService?;
     /**
      * @hidden
      */
@@ -126,6 +128,10 @@ export declare class MultiViewCalendarComponent implements AfterViewInit, Contro
      * @hidden
      */
     isActive: boolean;
+    /**
+     * @hidden
+     */
+    isHeaderActive: boolean;
     /**
      * Sets the dates of the MultiViewCalendar that will be disabled
      * ([see example]({% slug disabled_dates_multiviewcalendar %})).
@@ -210,6 +216,10 @@ export declare class MultiViewCalendarComponent implements AfterViewInit, Contro
      * ([more information and example]({% slug overview_multiviewcalendar %}#toc-events)).
      */
     valueChange: EventEmitter<any>;
+    /**
+     * @hidden
+     */
+    blurEvent: EventEmitter<any>;
     /**
      * @hidden
      */
@@ -266,6 +276,7 @@ export declare class MultiViewCalendarComponent implements AfterViewInit, Contro
      * @hidden
      */
     headerTitleTemplateRef: HeaderTitleTemplateDirective;
+    headerElement: ElementRef<HTMLElement>;
     viewList: HorizontalViewListComponent;
     cellUID: string;
     isHovered: boolean;
@@ -293,14 +304,13 @@ export declare class MultiViewCalendarComponent implements AfterViewInit, Contro
     readonly bottomViewEnum: CalendarViewEnum;
     readonly topViewEnum: CalendarViewEnum;
     readonly widgetId: string;
-    readonly widgetRole: string;
     readonly calendarTabIndex: number;
     readonly ariaDisabled: boolean;
     readonly ariaActivedescendant: string;
     /**
      * @hidden
      */
-    handleBlur(): void;
+    handleFocusout(event: any): void;
     /**
      * @hidden
      */
@@ -325,7 +335,7 @@ export declare class MultiViewCalendarComponent implements AfterViewInit, Contro
      * @hidden
      */
     keydown(event: KeyDown): void;
-    constructor(bus: BusViewService, element: ElementRef, navigator: NavigationService, renderer: Renderer2, cdr: ChangeDetectorRef, zone: NgZone, disabledDatesService: DisabledDatesService, selectionService: SelectionService);
+    constructor(bus: BusViewService, element: ElementRef, navigator: NavigationService, renderer: Renderer2, cdr: ChangeDetectorRef, zone: NgZone, disabledDatesService: DisabledDatesService, selectionService: SelectionService, pickerService?: PickerService);
     ngOnInit(): void;
     ngOnChanges(changes: any): void;
     ngOnDestroy(): void;
@@ -350,6 +360,10 @@ export declare class MultiViewCalendarComponent implements AfterViewInit, Contro
      * Blurs the Calendar component.
      */
     blur(): void;
+    /**
+     * @hidden
+     */
+    handleHeaderFocus(): void;
     /**
      * @hidden
      */

package/dist/es2015/calendar/multiview-calendar.component.js

@@ -3,13 +3,13 @@
 * Licensed under commercial license. See LICENSE.md in the project root for more information
 *-------------------------------------------------------------------------------------------*/
 import * as tslib_1 from "tslib";
-/* tslint:disable:no-forward-ref */
-import { Component, ChangeDetectorRef, ChangeDetectionStrategy, ContentChild, EventEmitter, ElementRef, Renderer2, isDevMode, forwardRef, HostBinding, HostListener, Input, Output, ViewChild, NgZone } from '@angular/core';
+import { Component, ChangeDetectorRef, ChangeDetectionStrategy, ContentChild, EventEmitter, ElementRef, Renderer2, isDevMode, forwardRef, HostBinding, HostListener, Input, Output, ViewChild, NgZone, Optional } from '@angular/core';
 import { NG_VALUE_ACCESSOR, NG_VALIDATORS } from '@angular/forms';
 import { L10N_PREFIX, LocalizationService } from '@progress/kendo-angular-l10n';
 import { cloneDate, isEqual } from '@progress/kendo-date-math';
 import { hasObservers, guid, Keys } from '@progress/kendo-angular-common';
 import { HorizontalViewListComponent } from './horizontal-view-list.component';
+import { HeaderComponent } from './header.component';
 import { BusViewService } from './services/bus-view.service';
 import { NavigationService } from './services/navigation.service';
 import { SelectionService } from './services/selection.service';
@@ -30,6 +30,7 @@ import { MIN_DATE, MAX_DATE } from '../defaults';
 import { areDatesEqual, dateInRange, getToday, hasExistingValue, last, noop } from '../util';
 import { Subscription } from 'rxjs';
 import { isPresent } from '../common/utils';
+import { PickerService } from '../common/picker.service';
 const BOTTOM_VIEW_DOC_LINK = 'http://www.telerik.com/kendo-angular-ui/components/dateinputs/api/CalendarComponent/#toc-bottomview';
 const TOP_VIEW_DOC_LINK = 'http://www.telerik.com/kendo-angular-ui/components/dateinputs/api/CalendarComponent/#toc-topview';
 const MIN_DOC_LINK = 'http://www.telerik.com/kendo-angular-ui/components/dateinputs/api/CalendarComponent/#toc-min';
@@ -66,7 +67,7 @@ export const RANGE_CALENDAR_RANGE_VALIDATORS = {
  * ```
  */
 let MultiViewCalendarComponent = class MultiViewCalendarComponent {
-    constructor(bus, element, navigator, renderer, cdr, zone, disabledDatesService, selectionService) {
+    constructor(bus, element, navigator, renderer, cdr, zone, disabledDatesService, selectionService, pickerService) {
         this.bus = bus;
         this.element = element;
         this.navigator = navigator;
@@ -75,6 +76,7 @@ let MultiViewCalendarComponent = class MultiViewCalendarComponent {
         this.zone = zone;
         this.disabledDatesService = disabledDatesService;
         this.selectionService = selectionService;
+        this.pickerService = pickerService;
         /**
          * @hidden
          */
@@ -114,6 +116,10 @@ let MultiViewCalendarComponent = class MultiViewCalendarComponent {
          * @hidden
          */
         this.isActive = false;
+        /**
+         * @hidden
+         */
+        this.isHeaderActive = false;
         /**
          * Defines the active view that the Calendar initially renders
          * ([see example]({% slug activeview_multiviewcalendar %})).
@@ -178,6 +184,10 @@ let MultiViewCalendarComponent = class MultiViewCalendarComponent {
          * ([more information and example]({% slug overview_multiviewcalendar %}#toc-events)).
          */
         this.valueChange = new EventEmitter();
+        /**
+         * @hidden
+         */
+        this.blurEvent = new EventEmitter();
         this.cellUID = guid();
         this.isHovered = false;
         this.isPrevDisabled = true;
@@ -341,9 +351,6 @@ let MultiViewCalendarComponent = class MultiViewCalendarComponent {
     get widgetId() {
         return this.id;
     }
-    get widgetRole() {
-        return 'grid';
-    }
     get calendarTabIndex() {
         return this.disabled ? undefined : this.tabIndex;
     }
@@ -356,16 +363,22 @@ let MultiViewCalendarComponent = class MultiViewCalendarComponent {
     /**
      * @hidden
      */
-    handleBlur() {
-        this.onControlTouched();
+    handleFocusout(event) {
+        const relatedTarget = event.relatedTarget;
+        if (!this.element.nativeElement.contains(relatedTarget)) {
+            this.blurEvent.emit(event);
+            this.onControlTouched();
+        }
         this.isActive = false;
         this.isHovered = false; //ensure that hovered is also not active
+        this.isHeaderActive = this.headerElement.nativeElement.contains(relatedTarget);
     }
     /**
      * @hidden
      */
     handleFocus() {
         this.isActive = true;
+        this.isHeaderActive = false;
     }
     /**
      * @hidden
@@ -398,7 +411,13 @@ let MultiViewCalendarComponent = class MultiViewCalendarComponent {
      * @hidden
      */
     keydown(event) {
+        if (this.isHeaderActive) {
+            return;
+        }
         if (event.keyCode === Keys.Enter) {
+            if (isPresent(this.pickerService)) {
+                event.preventDefault(); // Don't submit form from Datepicker popup
+            }
             this.performSelection(this.focusedDate, event);
         }
         const candidate = dateInRange(this.navigator.move(this.focusedDate, this.navigator.action(event), this.activeViewEnum), this.min, this.max);
@@ -473,6 +492,12 @@ let MultiViewCalendarComponent = class MultiViewCalendarComponent {
         }
         this.element.nativeElement.blur();
     }
+    /**
+     * @hidden
+     */
+    handleHeaderFocus() {
+        this.isHeaderActive = true;
+    }
     /**
      * @hidden
      */
@@ -792,6 +817,10 @@ tslib_1.__decorate([
     Output(),
     tslib_1.__metadata("design:type", EventEmitter)
 ], MultiViewCalendarComponent.prototype, "valueChange", void 0);
+tslib_1.__decorate([
+    Output('blur'),
+    tslib_1.__metadata("design:type", EventEmitter)
+], MultiViewCalendarComponent.prototype, "blurEvent", void 0);
 tslib_1.__decorate([
     ContentChild(CellTemplateDirective, { static: true }),
     tslib_1.__metadata("design:type", CellTemplateDirective)
@@ -855,6 +884,10 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", HeaderTitleTemplateDirective),
     tslib_1.__metadata("design:paramtypes", [HeaderTitleTemplateDirective])
 ], MultiViewCalendarComponent.prototype, "headerTitleTemplateRef", null);
+tslib_1.__decorate([
+    ViewChild(HeaderComponent, { static: false, read: ElementRef }),
+    tslib_1.__metadata("design:type", ElementRef)
+], MultiViewCalendarComponent.prototype, "headerElement", void 0);
 tslib_1.__decorate([
     ViewChild(HorizontalViewListComponent, { static: false }),
     tslib_1.__metadata("design:type", HorizontalViewListComponent)
@@ -864,11 +897,6 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", String),
     tslib_1.__metadata("design:paramtypes", [])
 ], MultiViewCalendarComponent.prototype, "widgetId", null);
-tslib_1.__decorate([
-    HostBinding('attr.role'),
-    tslib_1.__metadata("design:type", String),
-    tslib_1.__metadata("design:paramtypes", [])
-], MultiViewCalendarComponent.prototype, "widgetRole", null);
 tslib_1.__decorate([
     HostBinding('attr.tabindex'),
     tslib_1.__metadata("design:type", Number),
@@ -886,11 +914,11 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:paramtypes", [])
 ], MultiViewCalendarComponent.prototype, "ariaActivedescendant", null);
 tslib_1.__decorate([
-    HostListener("blur"),
+    HostListener('focusout', ['$event']),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", []),
+    tslib_1.__metadata("design:paramtypes", [Object]),
     tslib_1.__metadata("design:returntype", void 0)
-], MultiViewCalendarComponent.prototype, "handleBlur", null);
+], MultiViewCalendarComponent.prototype, "handleFocusout", null);
 tslib_1.__decorate([
     HostListener("focus"),
     tslib_1.__metadata("design:type", Function),
@@ -970,11 +998,15 @@ MultiViewCalendarComponent = tslib_1.__decorate([
         (todayButtonClick)="handleTodayButtonClick({ selectedDates: [$event], focusedDate: $event })"
         (prevButtonClick)="navigateView(prevView)"
         (nextButtonClick)="navigateView(nextView)"
+        [kendoEventsOutsideAngular]="{
+            focusin: handleHeaderFocus
+        }"
+        [scope]="this"
     >
     </kendo-calendar-header>
     <kendo-calendar-horizontal
         [activeView]="activeViewEnum"
-        [isActive]="isActive || isHovered"
+        [isActive]="isActive || (isHovered && !isHeaderActive)"
         [cellTemplateRef]="activeCellTemplate()?.templateRef"
         [weekNumberTemplateRef]="weekNumberTemplate?.templateRef"
         [cellUID]="cellUID"
@@ -998,6 +1030,7 @@ MultiViewCalendarComponent = tslib_1.__decorate([
     </kendo-calendar-horizontal>
   `
     }),
+    tslib_1.__param(8, Optional()),
     tslib_1.__metadata("design:paramtypes", [BusViewService,
         ElementRef,
         NavigationService,
@@ -1005,6 +1038,7 @@ MultiViewCalendarComponent = tslib_1.__decorate([
         ChangeDetectorRef,
         NgZone,
         DisabledDatesService,
-        SelectionService])
+        SelectionService,
+        PickerService])
 ], MultiViewCalendarComponent);
 export { MultiViewCalendarComponent };

package/dist/es2015/calendar/multiview-calendar.module.js

@@ -7,6 +7,7 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { IntlModule } from '@progress/kendo-angular-intl';
 import { PopupModule } from '@progress/kendo-angular-popup';
+import { EventsModule } from '@progress/kendo-angular-common';
 import { CalendarCommonModule } from './calendar-common.module';
 import { TemplatesModule } from './templates.module';
 import { HorizontalViewListComponent } from './horizontal-view-list.component';
@@ -72,7 +73,14 @@ MultiViewCalendarModule = tslib_1.__decorate([
             CalendarCommonModule,
             TemplatesModule
         ],
-        imports: [CommonModule, CalendarCommonModule, IntlModule, TemplatesModule, PopupModule],
+        imports: [
+            CommonModule,
+            CalendarCommonModule,
+            IntlModule,
+            TemplatesModule,
+            PopupModule,
+            EventsModule
+        ],
         providers: [
             NavigationService,
             CenturyViewService,

package/dist/es2015/calendar/view-list.component.js

@@ -297,7 +297,11 @@ ViewListComponent = tslib_1.__decorate([
         (scrollChange)="scrollChange($event)"
         (activeIndexChange)="setActiveDate($event)"
         >
-        <table class="k-calendar-table" #list>
+        <table
+            #list
+            role="grid"
+            class="k-calendar-table"
+        >
             <colgroup><col *ngFor="let _ of cols" /></colgroup>
 
             <tbody class="k-calendar-tbody"

package/dist/es2015/dateinput/dateinput.component.d.ts

@@ -154,11 +154,13 @@ export declare class DateInputComponent implements OnInit, ControlValueAccessor,
     /**
      * Specifies the biggest date that is valid
      * ([see example]({% slug dateranges_dateinput %})).
+     * By default, the `max` value is `2099-12-31`.
      */
     max: Date;
     /**
      * Specifies the smallest date that is valid
      * ([see example]({% slug dateranges_dateinput %})).
+     * By default, the `min` value is `1900-1-1`.
      */
     min: Date;
     /**

package/dist/es2015/datepicker/datepicker.component.d.ts

@@ -181,11 +181,13 @@ export declare class DatePickerComponent implements ControlValueAccessor, OnInit
     /**
      * Specifies the smallest valid date
      * ([see example]({% slug dateranges_datepicker %})).
+     * By default, the `min` value is `1900-1-1`.
      */
     min: Date;
     /**
      * Specifies the biggest valid date
      * ([see example]({% slug dateranges_datepicker %})).
+     * By default, the `max` value is `2099-12-31`.
      */
     max: Date;
     /**

package/dist/es2015/datepicker/datepicker.component.js

@@ -28,7 +28,7 @@ import { HeaderTitleTemplateDirective } from '../calendar/templates/header-title
 import { NavigationItemTemplateDirective } from '../calendar/templates/navigation-item-template.directive';
 import { PickerService } from '../common/picker.service';
 import { DisabledDatesService } from '../calendar/services/disabled-dates.service';
-import { noop, isValidRange, setTime, isWindowAvailable } from '../util';
+import { noop, isValidRange, setTime, isWindowAvailable, isTabExitingCalendar } from '../util';
 import { TOUCH_ENABLED } from '../touch-enabled';
 import { requiresZoneOnBlur, currentFocusTarget } from '../common/utils';
 import { fromEvent } from 'rxjs';
@@ -121,11 +121,13 @@ let DatePickerComponent = DatePickerComponent_1 = class DatePickerComponent {
         /**
          * Specifies the smallest valid date
          * ([see example]({% slug dateranges_datepicker %})).
+         * By default, the `min` value is `1900-1-1`.
          */
         this.min = cloneDate(MIN_DATE);
         /**
          * Specifies the biggest valid date
          * ([see example]({% slug dateranges_datepicker %})).
+         * By default, the `max` value is `2099-12-31`.
          */
         this.max = cloneDate(MAX_DATE);
         /**
@@ -629,7 +631,7 @@ let DatePickerComponent = DatePickerComponent_1 = class DatePickerComponent {
      * @hidden
      */
     handleKeydown(e) {
-        const { altKey, keyCode } = e;
+        const { altKey, shiftKey, keyCode, target } = e;
         if (keyCode === Keys.Escape) {
             this.show = false;
         }
@@ -641,7 +643,10 @@ let DatePickerComponent = DatePickerComponent_1 = class DatePickerComponent {
                 this.show = false;
             }
         }
-        if (keyCode === Keys.Tab && this.show && this.calendar.isActive) {
+        if (keyCode === Keys.Enter && target.classList.contains('k-calendar')) {
+            e.preventDefault(); // Don't submit form on date selection in popup
+        }
+        if (keyCode === Keys.Tab && this.show && this.calendar.isActive && isTabExitingCalendar(this.calendarType, target, shiftKey)) {
             this.input.focus();
             this.show = false;
         }