@progress/kendo-angular-dateinputs 13.0.0-develop.6 → 13.0.0-develop.8

package/fesm2020/progress-kendo-angular-dateinputs.mjs

@@ -36,8 +36,8 @@ const packageMetadata = {
     name: '@progress/kendo-angular-dateinputs',
     productName: 'Kendo UI for Angular',
     productCodes: ['KENDOUIANGULAR', 'KENDOUICOMPLETE'],
-    publishDate: 1685095143,
-    version: '13.0.0-develop.6',
+    publishDate: 1685107115,
+    version: '13.0.0-develop.8',
     licensingDocsUrl: 'https://www.telerik.com/kendo-angular-ui/my-license/'
 };
 
@@ -1978,13 +1978,16 @@ class HorizontalViewListComponent {
         return this.activeView === CalendarViewEnum.century;
     }
     get role() {
-        return this.views === 2 ? 'grid' : null;
+        return this.views >= 2 ? 'grid' : null;
+    }
+    get tabindex() {
+        return this.views >= 2 ? '0' : null;
     }
     get getActiveDescendant() {
         return this.views === 1 ? this.activeDescendant : null;
     }
     get getTabIndex() {
-        return this.disabled || this.views === 2 ? null : this.tabIndex;
+        return this.disabled || this.views >= 2 ? null : this.tabIndex;
     }
     ngOnChanges(changes) {
         this.initService();
@@ -2009,7 +2012,7 @@ class HorizontalViewListComponent {
         }
         this.setAriaActivedescendant();
         //set tabindex for MultiViewCalendar
-        if (this.views === 2) {
+        if (this.views >= 2) {
             this.renderer.setAttribute(this.element.nativeElement, 'tabindex', this.tabIndex.toString());
         }
     }
@@ -2156,16 +2159,16 @@ class HorizontalViewListComponent {
         return Math.min(this.total - skip, this.views);
     }
     setAriaActivedescendant() {
-        if (this.views === 2) {
+        if (this.views >= 2) {
             this.renderer.setAttribute(this.element.nativeElement, attributeNames.ariaActiveDescendant, this.activeDescendant);
         }
     }
 }
 HorizontalViewListComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: HorizontalViewListComponent, deps: [{ token: BusViewService }, { token: i1.IntlService }, { token: WeekNamesService }, { token: i0.ChangeDetectorRef }, { token: i0.ElementRef }, { token: i0.Renderer2 }], target: i0.ɵɵFactoryTarget.Component });
-HorizontalViewListComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.3.12", type: HorizontalViewListComponent, selector: "kendo-calendar-horizontal", inputs: { cellTemplateRef: "cellTemplateRef", weekNumberTemplateRef: "weekNumberTemplateRef", activeRangeEnd: "activeRangeEnd", activeView: "activeView", cellUID: "cellUID", focusedDate: "focusedDate", isActive: "isActive", min: "min", max: "max", selectionRange: "selectionRange", selectedDates: "selectedDates", views: "views", showViewHeader: "showViewHeader", animateNavigation: "animateNavigation", orientation: "orientation", activeDescendant: "activeDescendant", tabIndex: "tabIndex", disabled: "disabled", id: "id", weekNumber: "weekNumber" }, outputs: { cellClick: "cellClick", weekNumberCellClick: "weekNumberCellClick", cellEnter: "cellEnter", cellLeave: "cellLeave", activeDateChange: "activeDateChange", focusCalendar: "focusCalendar", blurCalendar: "blurCalendar", focusedCellChange: "focusedCellChange" }, host: { listeners: { "focus": "handleMultiViewCalendarFocus()", "blur": "handleMultiViewCalendarBlur($event)" }, properties: { "class.k-calendar-view": "this.getComponentClass", "class.k-align-items-start": "this.getComponentClass", "class.k-justify-content-center": "this.getComponentClass", "class.k-hstack": "this.horizontalHostClass", "class.k-vstack": "this.verticalHostClass", "class.k-calendar-monthview": "this.getComponentMonthClass", "class.k-calendar-yearview": "this.getComponentYearClass", "class.k-calendar-decadeview": "this.getComponentDecadeClass", "class.k-calendar-centuryview": "this.getComponentCenturyClass", "attr.role": "this.role" } }, usesOnChanges: true, ngImport: i0, template: `
+HorizontalViewListComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.3.12", type: HorizontalViewListComponent, selector: "kendo-calendar-horizontal", inputs: { cellTemplateRef: "cellTemplateRef", weekNumberTemplateRef: "weekNumberTemplateRef", activeRangeEnd: "activeRangeEnd", activeView: "activeView", cellUID: "cellUID", focusedDate: "focusedDate", isActive: "isActive", min: "min", max: "max", selectionRange: "selectionRange", selectedDates: "selectedDates", views: "views", showViewHeader: "showViewHeader", animateNavigation: "animateNavigation", orientation: "orientation", activeDescendant: "activeDescendant", tabIndex: "tabIndex", disabled: "disabled", id: "id", weekNumber: "weekNumber" }, outputs: { cellClick: "cellClick", weekNumberCellClick: "weekNumberCellClick", cellEnter: "cellEnter", cellLeave: "cellLeave", activeDateChange: "activeDateChange", focusCalendar: "focusCalendar", blurCalendar: "blurCalendar", focusedCellChange: "focusedCellChange" }, host: { listeners: { "focus": "handleMultiViewCalendarFocus()", "blur": "handleMultiViewCalendarBlur($event)" }, properties: { "class.k-calendar-view": "this.getComponentClass", "class.k-align-items-start": "this.getComponentClass", "class.k-justify-content-center": "this.getComponentClass", "class.k-hstack": "this.horizontalHostClass", "class.k-vstack": "this.verticalHostClass", "class.k-calendar-monthview": "this.getComponentMonthClass", "class.k-calendar-yearview": "this.getComponentYearClass", "class.k-calendar-decadeview": "this.getComponentDecadeClass", "class.k-calendar-centuryview": "this.getComponentCenturyClass", "attr.role": "this.role", "attr.tabindex": "this.tabindex" } }, usesOnChanges: true, ngImport: i0, template: `
         <ng-template #tableTemplate let-date="date" let-class="className">
             <table
-                [attr.role]="views === 2 ? 'none' : 'grid'"
+                [attr.role]="views >= 2 ? 'none' : 'grid'"
                 class="k-content k-calendar-table"
                 [ngClass]="class"
                 [attr.aria-labelledby]="id"
@@ -2252,7 +2255,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
                     template: `
         <ng-template #tableTemplate let-date="date" let-class="className">
             <table
-                [attr.role]="views === 2 ? 'none' : 'grid'"
+                [attr.role]="views >= 2 ? 'none' : 'grid'"
                 class="k-content k-calendar-table"
                 [ngClass]="class"
                 [attr.aria-labelledby]="id"
@@ -2424,6 +2427,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
             }], role: [{
                 type: HostBinding,
                 args: ['attr.role']
+            }], tabindex: [{
+                type: HostBinding,
+                args: ['attr.tabindex']
             }] } });
 
 /**
@@ -3356,6 +3362,18 @@ class MultiViewCalendarComponent {
          * @hidden
          */
         this.focusCalendar = new EventEmitter();
+        /**
+         * @hidden
+         */
+        this.onClosePopup = new EventEmitter();
+        /**
+         * @hidden
+         */
+        this.onTabPress = new EventEmitter();
+        /**
+         * @hidden
+         */
+        this.onShiftTabPress = new EventEmitter();
         this.cellUID = guid();
         this.isHovered = false;
         this.isPrevDisabled = true;
@@ -3400,7 +3418,7 @@ class MultiViewCalendarComponent {
      * @hidden
      */
     get multiViewCalendarHeaderIdLabel() {
-        return this.views === 2 ? this.id + 'header-' : null;
+        return this.views >= 2 ? this.id + 'header-' : null;
     }
     /**
  * @hidden
@@ -3578,7 +3596,7 @@ class MultiViewCalendarComponent {
         return CalendarViewEnum[this.topView];
     }
     get widgetId() {
-        return this.views === 2 ? this.id : null;
+        return this.views >= 2 ? this.id : null;
     }
     get ariaDisabled() {
         return this.disabled;
@@ -3648,6 +3666,11 @@ class MultiViewCalendarComponent {
         const onArrowLeftAndControl = event.keyCode === Keys$1.ArrowLeft && ctrlKey;
         const onTKeyPress = event.keyCode === Keys$1.KeyT;
         const onEnterKeyPress = event.keyCode === Keys$1.Enter;
+        const onArrowUpPress = event.keyCode === Keys$1.ArrowUp;
+        const altKey = event.altKey;
+        const escKey = event.keyCode === Keys$1.Escape;
+        const tabKeyPress = event.keyCode === Keys$1.Tab;
+        const shiftKeyPress = event.shiftKey;
         if (onArrowRightAndControl) {
             event.preventDefault();
             this.navigateView(this.nextView);
@@ -3670,6 +3693,17 @@ class MultiViewCalendarComponent {
             this.selectionService.lastClicked = this.focusedDate;
             this.performSelection(this.focusedDate, event);
         }
+        if (this.views >= 2) {
+            if ((escKey || (altKey && onArrowUpPress))) {
+                this.onClosePopup.emit(event);
+            }
+            else if ((tabKeyPress && shiftKeyPress)) {
+                this.onShiftTabPress.emit(event);
+            }
+            else if ((tabKeyPress && !shiftKeyPress)) {
+                this.onTabPress.emit(event);
+            }
+        }
         const candidate = dateInRange(this.navigator.move(this.focusedDate, this.navigator.action(event), this.activeViewEnum), this.min, this.max);
         if (isEqual(this.focusedDate, candidate)) {
             return;
@@ -3745,7 +3779,7 @@ class MultiViewCalendarComponent {
         if (!this.element) {
             return;
         }
-        const activeElement = this.views === 2 ? this.element.nativeElement.querySelector('.k-calendar-view') :
+        const activeElement = this.views >= 2 ? this.element.nativeElement.querySelector('.k-calendar-view') :
             this.element.nativeElement.querySelector('.k-content.k-calendar-table');
         activeElement.blur();
     }
@@ -3955,7 +3989,7 @@ class MultiViewCalendarComponent {
     }
 }
 MultiViewCalendarComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: MultiViewCalendarComponent, deps: [{ token: BusViewService }, { token: i0.ElementRef }, { token: NavigationService }, { token: i0.Renderer2 }, { token: i0.ChangeDetectorRef }, { token: i0.NgZone }, { token: DisabledDatesService }, { token: SelectionService }], target: i0.ɵɵFactoryTarget.Component });
-MultiViewCalendarComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.3.12", type: MultiViewCalendarComponent, selector: "kendo-multiviewcalendar", inputs: { id: "id", focusedDate: "focusedDate", min: "min", max: "max", rangeValidation: "rangeValidation", disabledDatesRangeValidation: "disabledDatesRangeValidation", selection: "selection", value: "value", disabled: "disabled", tabindex: "tabindex", tabIndex: "tabIndex", isActive: "isActive", disabledDates: "disabledDates", activeView: "activeView", bottomView: "bottomView", topView: "topView", showViewHeader: "showViewHeader", animateNavigation: "animateNavigation", weekNumber: "weekNumber", activeRangeEnd: "activeRangeEnd", selectionRange: "selectionRange", views: "views", orientation: "orientation", cellTemplateRef: ["cellTemplate", "cellTemplateRef"], monthCellTemplateRef: ["monthCellTemplate", "monthCellTemplateRef"], yearCellTemplateRef: ["yearCellTemplate", "yearCellTemplateRef"], decadeCellTemplateRef: ["decadeCellTemplate", "decadeCellTemplateRef"], centuryCellTemplateRef: ["centuryCellTemplate", "centuryCellTemplateRef"], weekNumberTemplateRef: ["weekNumberTemplate", "weekNumberTemplateRef"], headerTitleTemplateRef: ["headerTitleTemplate", "headerTitleTemplateRef"] }, outputs: { activeViewChange: "activeViewChange", navigate: "navigate", cellEnter: "cellEnter", cellLeave: "cellLeave", valueChange: "valueChange", blurEvent: "blur", focusEvent: "focus", focusCalendar: "focusCalendar" }, host: { listeners: { "mouseenter": "handleMouseEnter()", "mouseleave": "handleMouseLeave()", "mousedown": "handleMousedown($event)", "click": "handleClick()", "keydown": "keydown($event)" }, properties: { "attr.id": "this.widgetId", "attr.aria-disabled": "this.ariaDisabled", "class.k-disabled": "this.ariaDisabled" } }, providers: [
+MultiViewCalendarComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "13.3.12", type: MultiViewCalendarComponent, selector: "kendo-multiviewcalendar", inputs: { id: "id", focusedDate: "focusedDate", min: "min", max: "max", rangeValidation: "rangeValidation", disabledDatesRangeValidation: "disabledDatesRangeValidation", selection: "selection", value: "value", disabled: "disabled", tabindex: "tabindex", tabIndex: "tabIndex", isActive: "isActive", disabledDates: "disabledDates", activeView: "activeView", bottomView: "bottomView", topView: "topView", showViewHeader: "showViewHeader", animateNavigation: "animateNavigation", weekNumber: "weekNumber", activeRangeEnd: "activeRangeEnd", selectionRange: "selectionRange", views: "views", orientation: "orientation", cellTemplateRef: ["cellTemplate", "cellTemplateRef"], monthCellTemplateRef: ["monthCellTemplate", "monthCellTemplateRef"], yearCellTemplateRef: ["yearCellTemplate", "yearCellTemplateRef"], decadeCellTemplateRef: ["decadeCellTemplate", "decadeCellTemplateRef"], centuryCellTemplateRef: ["centuryCellTemplate", "centuryCellTemplateRef"], weekNumberTemplateRef: ["weekNumberTemplate", "weekNumberTemplateRef"], headerTitleTemplateRef: ["headerTitleTemplate", "headerTitleTemplateRef"] }, outputs: { activeViewChange: "activeViewChange", navigate: "navigate", cellEnter: "cellEnter", cellLeave: "cellLeave", valueChange: "valueChange", blurEvent: "blur", focusEvent: "focus", focusCalendar: "focusCalendar", onClosePopup: "onClosePopup", onTabPress: "onTabPress", onShiftTabPress: "onShiftTabPress" }, host: { listeners: { "mouseenter": "handleMouseEnter()", "mouseleave": "handleMouseLeave()", "mousedown": "handleMousedown($event)", "click": "handleClick()", "keydown": "keydown($event)" }, properties: { "attr.id": "this.widgetId", "attr.aria-disabled": "this.ariaDisabled", "class.k-disabled": "this.ariaDisabled" } }, providers: [
         BusViewService,
         RANGE_CALENDAR_VALUE_ACCESSOR,
         RANGE_CALENDAR_RANGE_VALIDATORS,
@@ -4179,6 +4213,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
                 args: ['focus']
             }], focusCalendar: [{
                 type: Output
+            }], onClosePopup: [{
+                type: Output
+            }], onTabPress: [{
+                type: Output
+            }], onShiftTabPress: [{
+                type: Output
             }], cellTemplate: [{
                 type: ContentChild,
                 args: [CellTemplateDirective, { static: false }]
@@ -6659,7 +6699,7 @@ CalendarComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0", vers
             </kendo-multiviewcalendar-messages>
         </kendo-multiviewcalendar>
     </ng-container>
-  `, isInline: true, components: [{ type: NavigationComponent, selector: "kendo-calendar-navigation", inputs: ["activeView", "min", "max", "focusedDate", "templateRef"], outputs: ["valueChange", "pageChange"] }, { type: ViewListComponent, selector: "kendo-calendar-viewlist", inputs: ["cellTemplateRef", "weekNumberTemplateRef", "headerTitleTemplateRef", "activeView", "cellUID", "focusedDate", "isActive", "min", "max", "selectedDates", "tabIndex", "disabled", "id", "weekNumber"], outputs: ["cellClick", "weekNumberCellClick", "activeDateChange", "todayButtonClick", "pageChange", "focusCalendar", "blurCalendar", "focusedCellChange"] }, { type: i8.ResizeSensorComponent, selector: "kendo-resize-sensor", inputs: ["rateLimit"], outputs: ["resize"] }, { type: MultiViewCalendarComponent, selector: "kendo-multiviewcalendar", inputs: ["id", "focusedDate", "min", "max", "rangeValidation", "disabledDatesRangeValidation", "selection", "value", "disabled", "tabindex", "tabIndex", "isActive", "disabledDates", "activeView", "bottomView", "topView", "showViewHeader", "animateNavigation", "weekNumber", "activeRangeEnd", "selectionRange", "views", "orientation", "cellTemplate", "monthCellTemplate", "yearCellTemplate", "decadeCellTemplate", "centuryCellTemplate", "weekNumberTemplate", "headerTitleTemplate"], outputs: ["activeViewChange", "navigate", "cellEnter", "cellLeave", "valueChange", "blur", "focus", "focusCalendar"], exportAs: ["kendo-multiviewcalendar"] }, { type: MultiViewCalendarCustomMessagesComponent, selector: "kendo-multiviewcalendar-messages" }], directives: [{ type: CalendarLocalizedMessagesDirective, selector: "[kendoCalendarLocalizedMessages]" }, { type: i7.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush });
+  `, isInline: true, components: [{ type: NavigationComponent, selector: "kendo-calendar-navigation", inputs: ["activeView", "min", "max", "focusedDate", "templateRef"], outputs: ["valueChange", "pageChange"] }, { type: ViewListComponent, selector: "kendo-calendar-viewlist", inputs: ["cellTemplateRef", "weekNumberTemplateRef", "headerTitleTemplateRef", "activeView", "cellUID", "focusedDate", "isActive", "min", "max", "selectedDates", "tabIndex", "disabled", "id", "weekNumber"], outputs: ["cellClick", "weekNumberCellClick", "activeDateChange", "todayButtonClick", "pageChange", "focusCalendar", "blurCalendar", "focusedCellChange"] }, { type: i8.ResizeSensorComponent, selector: "kendo-resize-sensor", inputs: ["rateLimit"], outputs: ["resize"] }, { type: MultiViewCalendarComponent, selector: "kendo-multiviewcalendar", inputs: ["id", "focusedDate", "min", "max", "rangeValidation", "disabledDatesRangeValidation", "selection", "value", "disabled", "tabindex", "tabIndex", "isActive", "disabledDates", "activeView", "bottomView", "topView", "showViewHeader", "animateNavigation", "weekNumber", "activeRangeEnd", "selectionRange", "views", "orientation", "cellTemplate", "monthCellTemplate", "yearCellTemplate", "decadeCellTemplate", "centuryCellTemplate", "weekNumberTemplate", "headerTitleTemplate"], outputs: ["activeViewChange", "navigate", "cellEnter", "cellLeave", "valueChange", "blur", "focus", "focusCalendar", "onClosePopup", "onTabPress", "onShiftTabPress"], exportAs: ["kendo-multiviewcalendar"] }, { type: MultiViewCalendarCustomMessagesComponent, selector: "kendo-multiviewcalendar-messages" }], directives: [{ type: CalendarLocalizedMessagesDirective, selector: "[kendoCalendarLocalizedMessages]" }, { type: i7.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: CalendarComponent, decorators: [{
             type: Component,
             args: [{
@@ -11813,22 +11853,7 @@ TimeSelectorComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0",
                 </div>
             </ng-template>
         </div>
-        <div class="k-time-footer k-action-buttons k-actions k-actions-stretched" *ngIf="setButton || cancelButton">
-            <button
-                #cancel
-                *ngIf="cancelButton"
-                class="k-button k-time-cancel k-button-md k-rounded-md k-button-solid k-button-solid-base"
-                type="button"
-                [attr.title]="localization.get('cancelLabel')"
-                [attr.aria-label]="localization.get('cancelLabel')"
-                [kendoEventsOutsideAngular]="{
-                    click: handleReject,
-                    focus: handleFocus,
-                    blur: handleBlur
-                }"
-                [scope]="this"
-                [disabled]="disabled"
-            >{{localization.get('cancel')}}</button>
+        <div class="k-time-footer k-actions k-actions-stretched k-actions-horizontal" *ngIf="setButton || cancelButton">
             <button
                 #accept
                 *ngIf="setButton"
@@ -11845,6 +11870,21 @@ TimeSelectorComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0",
                 [scope]="this"
                 [disabled]="disabled"
             >{{localization.get('accept')}}</button>
+            <button
+                #cancel
+                *ngIf="cancelButton"
+                class="k-button k-time-cancel k-button-md k-rounded-md k-button-solid k-button-solid-base"
+                type="button"
+                [attr.title]="localization.get('cancelLabel')"
+                [attr.aria-label]="localization.get('cancelLabel')"
+                [kendoEventsOutsideAngular]="{
+                    click: handleReject,
+                    focus: handleFocus,
+                    blur: handleBlur
+                }"
+                [scope]="this"
+                [disabled]="disabled"
+            >{{localization.get('cancel')}}</button>
         </div>
     `, isInline: true, components: [{ type: TimeListComponent, selector: "kendo-timelist", inputs: ["min", "max", "part", "step", "disabled", "value", "isLast"], outputs: ["valueChange", "tabOutLastPart"] }], directives: [{ type: TimeSelectorLocalizedMessagesDirective, selector: "[kendoTimeSelectorLocalizedMessages]" }, { type: i7.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { type: i8.EventsOutsideAngularDirective, selector: "[kendoEventsOutsideAngular]", inputs: ["kendoEventsOutsideAngular", "scope"] }, { type: i7.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: TimeSelectorComponent, decorators: [{
@@ -11933,22 +11973,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
                 </div>
             </ng-template>
         </div>
-        <div class="k-time-footer k-action-buttons k-actions k-actions-stretched" *ngIf="setButton || cancelButton">
-            <button
-                #cancel
-                *ngIf="cancelButton"
-                class="k-button k-time-cancel k-button-md k-rounded-md k-button-solid k-button-solid-base"
-                type="button"
-                [attr.title]="localization.get('cancelLabel')"
-                [attr.aria-label]="localization.get('cancelLabel')"
-                [kendoEventsOutsideAngular]="{
-                    click: handleReject,
-                    focus: handleFocus,
-                    blur: handleBlur
-                }"
-                [scope]="this"
-                [disabled]="disabled"
-            >{{localization.get('cancel')}}</button>
+        <div class="k-time-footer k-actions k-actions-stretched k-actions-horizontal" *ngIf="setButton || cancelButton">
             <button
                 #accept
                 *ngIf="setButton"
@@ -11965,6 +11990,21 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
                 [scope]="this"
                 [disabled]="disabled"
             >{{localization.get('accept')}}</button>
+            <button
+                #cancel
+                *ngIf="cancelButton"
+                class="k-button k-time-cancel k-button-md k-rounded-md k-button-solid k-button-solid-base"
+                type="button"
+                [attr.title]="localization.get('cancelLabel')"
+                [attr.aria-label]="localization.get('cancelLabel')"
+                [kendoEventsOutsideAngular]="{
+                    click: handleReject,
+                    focus: handleFocus,
+                    blur: handleBlur
+                }"
+                [scope]="this"
+                [disabled]="disabled"
+            >{{localization.get('cancel')}}</button>
         </div>
     `
                 }]
@@ -15038,7 +15078,7 @@ DateTimePickerComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0"
                 </div>
                 <div
                     *ngIf="!isAdaptive"
-                    class="k-datetime-footer k-action-buttons k-actions k-hstack k-justify-content-stretch"
+                    class="k-datetime-footer k-actions k-actions-stretched k-actions-horizontal"
                     [kendoEventsOutsideAngular]="{
                         focusin: handleFocus,
                         focusout: handleBlur
@@ -15046,34 +15086,34 @@ DateTimePickerComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0"
                     [scope]="this"
                 >
                     <button
-                        *ngIf="cancelButton"
                         type="button"
-                        class="k-button k-time-cancel"
-                        [ngClass]="popupButtonsClasses()"
-                        [attr.title]="localization.get('cancelLabel')"
-                        [attr.aria-label]="localization.get('cancelLabel')"
+                        class="k-button k-time-accept"
+                        [ngClass]="popupButtonsClasses('primary')"
+                        [attr.title]="localization.get('acceptLabel')"
+                        [attr.aria-label]="localization.get('acceptLabel')"
+                        [disabled]="!calendarValue"
                         [kendoEventsOutsideAngular]="{
-                            click: handleCancel,
+                            click: handleAccept,
                             'keydown.tab': handleTab
                         }"
                         [scope]="this"
                     >
-                        {{localization.get('cancel')}}
+                        {{localization.get('accept')}}
                     </button>
                     <button
+                        *ngIf="cancelButton"
                         type="button"
-                        class="k-button k-time-accept"
-                        [ngClass]="popupButtonsClasses('primary')"
-                        [attr.title]="localization.get('acceptLabel')"
-                        [attr.aria-label]="localization.get('acceptLabel')"
-                        [disabled]="!calendarValue"
+                        class="k-button k-time-cancel"
+                        [ngClass]="popupButtonsClasses()"
+                        [attr.title]="localization.get('cancelLabel')"
+                        [attr.aria-label]="localization.get('cancelLabel')"
                         [kendoEventsOutsideAngular]="{
-                            click: handleAccept,
+                            click: handleCancel,
                             'keydown.tab': handleTab
                         }"
                         [scope]="this"
                     >
-                        {{localization.get('accept')}}
+                        {{localization.get('cancel')}}
                     </button>
                 </div>
             </div>
@@ -15400,7 +15440,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
                 </div>
                 <div
                     *ngIf="!isAdaptive"
-                    class="k-datetime-footer k-action-buttons k-actions k-hstack k-justify-content-stretch"
+                    class="k-datetime-footer k-actions k-actions-stretched k-actions-horizontal"
                     [kendoEventsOutsideAngular]="{
                         focusin: handleFocus,
                         focusout: handleBlur
@@ -15408,34 +15448,34 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
                     [scope]="this"
                 >
                     <button
-                        *ngIf="cancelButton"
                         type="button"
-                        class="k-button k-time-cancel"
-                        [ngClass]="popupButtonsClasses()"
-                        [attr.title]="localization.get('cancelLabel')"
-                        [attr.aria-label]="localization.get('cancelLabel')"
+                        class="k-button k-time-accept"
+                        [ngClass]="popupButtonsClasses('primary')"
+                        [attr.title]="localization.get('acceptLabel')"
+                        [attr.aria-label]="localization.get('acceptLabel')"
+                        [disabled]="!calendarValue"
                         [kendoEventsOutsideAngular]="{
-                            click: handleCancel,
+                            click: handleAccept,
                             'keydown.tab': handleTab
                         }"
                         [scope]="this"
                     >
-                        {{localization.get('cancel')}}
+                        {{localization.get('accept')}}
                     </button>
                     <button
+                        *ngIf="cancelButton"
                         type="button"
-                        class="k-button k-time-accept"
-                        [ngClass]="popupButtonsClasses('primary')"
-                        [attr.title]="localization.get('acceptLabel')"
-                        [attr.aria-label]="localization.get('acceptLabel')"
-                        [disabled]="!calendarValue"
+                        class="k-button k-time-cancel"
+                        [ngClass]="popupButtonsClasses()"
+                        [attr.title]="localization.get('cancelLabel')"
+                        [attr.aria-label]="localization.get('cancelLabel')"
                         [kendoEventsOutsideAngular]="{
-                            click: handleAccept,
+                            click: handleCancel,
                             'keydown.tab': handleTab
                         }"
                         [scope]="this"
                     >
-                        {{localization.get('accept')}}
+                        {{localization.get('cancel')}}
                     </button>
                 </div>
             </div>
@@ -16321,6 +16361,48 @@ class DateRangePopupComponent {
         }
         this.windowSize = windowSize();
     }
+    /**
+     * @hidden
+     */
+    closePopup(event) {
+        event.preventDefault();
+        event.stopPropagation();
+        this.toggle(false);
+        if (this.dateRangeService.activeRangeEnd === 'start' || !this.dateRangeService.activeRangeEnd) {
+            this.dateRangeService.startInput$.value.focus();
+        }
+        else {
+            this.dateRangeService.endInput$.value.focus();
+        }
+        ;
+    }
+    /**
+     * @hidden
+     */
+    handleTab(event) {
+        event.preventDefault();
+        event.stopPropagation();
+        if (this.dateRangeService.activeRangeEnd === 'start' || !this.dateRangeService.activeRangeEnd) {
+            this.dateRangeService.setActiveRangeEnd('end');
+        }
+        else {
+            this.dateRangeService.endInput$.value.focus();
+        }
+    }
+    ;
+    /**
+     * @hidden
+     */
+    handleShiftTab(event) {
+        event.preventDefault();
+        event.stopPropagation();
+        if (this.dateRangeService.activeRangeEnd === 'end') {
+            this.dateRangeService.setActiveRangeEnd('start');
+        }
+        else {
+            this.dateRangeService.startInput$.value.focus();
+        }
+    }
     handleWindowBlur() {
         if (!this.show || this.actionSheet.expanded) {
             return;
@@ -16465,7 +16547,7 @@ DateRangePopupComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0"
         </ng-container> 
         <ng-container #container></ng-container>
         <ng-template #defaultTemplate>
-            <kendo-multiviewcalendar kendoDateRangeSelection></kendo-multiviewcalendar>
+            <kendo-multiviewcalendar kendoDateRangeSelection (onClosePopup)="closePopup($event)" (onTabPress)="handleTab($event)" (onShiftTabPress)="handleShiftTab($event)"></kendo-multiviewcalendar>
         </ng-template>
 
         <kendo-actionsheet 
@@ -16533,7 +16615,7 @@ DateRangePopupComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "12.0.0"
                 </div>
             </ng-template>
         </kendo-actionsheet>
-    `, isInline: true, components: [{ type: MultiViewCalendarComponent, selector: "kendo-multiviewcalendar", inputs: ["id", "focusedDate", "min", "max", "rangeValidation", "disabledDatesRangeValidation", "selection", "value", "disabled", "tabindex", "tabIndex", "isActive", "disabledDates", "activeView", "bottomView", "topView", "showViewHeader", "animateNavigation", "weekNumber", "activeRangeEnd", "selectionRange", "views", "orientation", "cellTemplate", "monthCellTemplate", "yearCellTemplate", "decadeCellTemplate", "centuryCellTemplate", "weekNumberTemplate", "headerTitleTemplate"], outputs: ["activeViewChange", "navigate", "cellEnter", "cellLeave", "valueChange", "blur", "focus", "focusCalendar"], exportAs: ["kendo-multiviewcalendar"] }, { type: i9.ActionSheetComponent, selector: "kendo-actionsheet", inputs: ["title", "subtitle", "items", "cssClass", "animation", "expanded", "titleId"], outputs: ["expandedChange", "expand", "collapse", "itemClick", "overlayClick"], exportAs: ["kendoActionSheet"] }, { type: i8.ResizeSensorComponent, selector: "kendo-resize-sensor", inputs: ["rateLimit"], outputs: ["resize"] }, { type: i10.Button, selector: "button[kendoButton], span[kendoButton], kendo-button", inputs: ["toggleable", "togglable", "selected", "tabIndex", "imageUrl", "iconClass", "icon", "disabled", "size", "rounded", "fillMode", "themeColor", "svgIcon", "role", "primary", "look"], outputs: ["selectedChange", "click"], exportAs: ["kendoButton"] }], directives: [{ type: DateRangePopupLocalizedMessagesDirective, selector: "[kendoDateRangePopupLocalizedMessages]" }, { type: DateRangeSelectionDirective, selector: "[kendoDateRangeSelection]", inputs: ["autoCorrectOn", "selectionRange", "activeRangeEnd", "shouldSetRange"], outputs: ["activeRangeEndChange", "selectionRangeChange"] }, { type: i9.ActionSheetTemplateDirective, selector: "[kendoActionSheetTemplate]" }, { type: i7.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }] });
+    `, isInline: true, components: [{ type: MultiViewCalendarComponent, selector: "kendo-multiviewcalendar", inputs: ["id", "focusedDate", "min", "max", "rangeValidation", "disabledDatesRangeValidation", "selection", "value", "disabled", "tabindex", "tabIndex", "isActive", "disabledDates", "activeView", "bottomView", "topView", "showViewHeader", "animateNavigation", "weekNumber", "activeRangeEnd", "selectionRange", "views", "orientation", "cellTemplate", "monthCellTemplate", "yearCellTemplate", "decadeCellTemplate", "centuryCellTemplate", "weekNumberTemplate", "headerTitleTemplate"], outputs: ["activeViewChange", "navigate", "cellEnter", "cellLeave", "valueChange", "blur", "focus", "focusCalendar", "onClosePopup", "onTabPress", "onShiftTabPress"], exportAs: ["kendo-multiviewcalendar"] }, { type: i9.ActionSheetComponent, selector: "kendo-actionsheet", inputs: ["title", "subtitle", "items", "cssClass", "animation", "expanded", "titleId"], outputs: ["expandedChange", "expand", "collapse", "itemClick", "overlayClick"], exportAs: ["kendoActionSheet"] }, { type: i8.ResizeSensorComponent, selector: "kendo-resize-sensor", inputs: ["rateLimit"], outputs: ["resize"] }, { type: i10.Button, selector: "button[kendoButton], span[kendoButton], kendo-button", inputs: ["toggleable", "togglable", "selected", "tabIndex", "imageUrl", "iconClass", "icon", "disabled", "size", "rounded", "fillMode", "themeColor", "svgIcon", "role", "primary", "look"], outputs: ["selectedChange", "click"], exportAs: ["kendoButton"] }], directives: [{ type: DateRangePopupLocalizedMessagesDirective, selector: "[kendoDateRangePopupLocalizedMessages]" }, { type: DateRangeSelectionDirective, selector: "[kendoDateRangeSelection]", inputs: ["autoCorrectOn", "selectionRange", "activeRangeEnd", "shouldSetRange"], outputs: ["activeRangeEndChange", "selectionRangeChange"] }, { type: i9.ActionSheetTemplateDirective, selector: "[kendoActionSheetTemplate]" }, { type: i7.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImport: i0, type: DateRangePopupComponent, decorators: [{
             type: Component,
             args: [{
@@ -16563,7 +16645,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
         </ng-container> 
         <ng-container #container></ng-container>
         <ng-template #defaultTemplate>
-            <kendo-multiviewcalendar kendoDateRangeSelection></kendo-multiviewcalendar>
+            <kendo-multiviewcalendar kendoDateRangeSelection (onClosePopup)="closePopup($event)" (onTabPress)="handleTab($event)" (onShiftTabPress)="handleShiftTab($event)"></kendo-multiviewcalendar>
         </ng-template>
 
         <kendo-actionsheet 
@@ -16804,7 +16886,6 @@ class DateRangeInput {
         }
         [
             this.input.onBlur.subscribe(() => this.deactivate()),
-            this.input.onFocus.pipe(filter(() => !this.popupCalendarActivated)).subscribe(() => this.activate()),
             this.input.valueUpdate.subscribe(value => this.updateRange(value, 'change')),
             this.dateRangeService.activeRangeEnd$.subscribe(() => {
                 if (this.navigateCalendarOnFocus) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@progress/kendo-angular-dateinputs",
-  "version": "13.0.0-develop.6",
+  "version": "13.0.0-develop.8",
   "description": "Kendo UI for Angular Date Inputs Package - Everything you need to add date selection functionality to apps (DatePicker, TimePicker, DateInput, DateRangePicker, DateTimePicker, Calendar, and MultiViewCalendar).",
   "license": "SEE LICENSE IN LICENSE.md",
   "author": "Progress",
@@ -33,20 +33,20 @@
     "@angular/core": "13 - 16",
     "@angular/platform-browser": "13 - 16",
     "@progress/kendo-licensing": "^1.0.2",
-    "@progress/kendo-angular-common": "13.0.0-develop.6",
-    "@progress/kendo-angular-intl": "13.0.0-develop.6",
-    "@progress/kendo-angular-l10n": "13.0.0-develop.6",
-    "@progress/kendo-angular-icons": "13.0.0-develop.6",
-    "@progress/kendo-angular-popup": "13.0.0-develop.6",
-    "@progress/kendo-angular-navigation": "13.0.0-develop.6",
+    "@progress/kendo-angular-common": "13.0.0-develop.8",
+    "@progress/kendo-angular-intl": "13.0.0-develop.8",
+    "@progress/kendo-angular-l10n": "13.0.0-develop.8",
+    "@progress/kendo-angular-icons": "13.0.0-develop.8",
+    "@progress/kendo-angular-popup": "13.0.0-develop.8",
+    "@progress/kendo-angular-navigation": "13.0.0-develop.8",
     "rxjs": "^6.5.3 || ^7.0.0",
-    "@progress/kendo-angular-buttons": "13.0.0-develop.6",
-    "@progress/kendo-angular-inputs": "13.0.0-develop.6",
-    "@progress/kendo-angular-label": "13.0.0-develop.6"
+    "@progress/kendo-angular-buttons": "13.0.0-develop.8",
+    "@progress/kendo-angular-inputs": "13.0.0-develop.8",
+    "@progress/kendo-angular-label": "13.0.0-develop.8"
   },
   "dependencies": {
     "tslib": "^2.3.1",
-    "@progress/kendo-angular-schematics": "13.0.0-develop.6",
+    "@progress/kendo-angular-schematics": "13.0.0-develop.8",
     "@progress/kendo-common": "^0.2.0",
     "@progress/kendo-date-math": "^1.1.0"
   },