@progress/kendo-angular-scheduler 16.9.1-develop.1 → 16.9.1-develop.3

package/esm2020/navigation/shortcuts.directive.mjs

@@ -119,6 +119,10 @@ export class ShortcutsDirective {
                     if (e.target.tagName === CALENDAR_TAG) {
                         return;
                     }
+                    // do nothing if the shortcut is executed on an element inside the kendoSchedulerToolbarTemplate
+                    if (this.isInToolbarTemplate(e.target)) {
+                        return;
+                    }
                     const prevented = this.scheduler.onNavigationAction({ type: 'focus-prev' });
                     if (!prevented) {
                         const item = this.focusService.activeItem;
@@ -136,6 +140,10 @@ export class ShortcutsDirective {
                     if (e.target.tagName === CALENDAR_TAG) {
                         return;
                     }
+                    // do nothing if the shortcut is executed on an element inside the kendoSchedulerToolbarTemplate
+                    if (this.isInToolbarTemplate(e.target)) {
+                        return;
+                    }
                     const prevented = this.scheduler.onNavigationAction({ type: 'focus-next' });
                     if (!prevented) {
                         const isInToolbar = this.focusService.activeItem.containerType === 'toolbar';
@@ -186,6 +194,13 @@ export class ShortcutsDirective {
     focusWait() {
         this.viewState.layoutEnd.pipe(take(1)).subscribe(() => this.focusService.focus());
     }
+    isInToolbarTemplate(element) {
+        const isInToolbar = element.closest('.k-scheduler-toolbar');
+        const isInBuiltInElement = element.closest('.k-toolbar-group') ||
+            element.closest('.k-scheduler-views') ||
+            element.closest('.k-views-dropdown');
+        return isInToolbar && !isInBuiltInElement;
+    }
 }
 ShortcutsDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: ShortcutsDirective, deps: [{ token: i1.SchedulerComponent }, { token: i2.DomEventsService }, { token: i3.FocusService }, { token: i0.NgZone }, { token: i0.ChangeDetectorRef }, { token: i4.ViewStateService }, { token: i5.DialogsService }], target: i0.ɵɵFactoryTarget.Directive });
 ShortcutsDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.2.10", type: ShortcutsDirective, isStandalone: true, selector: "kendo-scheduler", ngImport: i0 });

package/esm2020/package-metadata.mjs

@@ -9,7 +9,7 @@ export const packageMetadata = {
     name: '@progress/kendo-angular-scheduler',
     productName: 'Kendo UI for Angular',
     productCodes: ['KENDOUIANGULAR', 'KENDOUICOMPLETE'],
-    publishDate: 1726051093,
-    version: '16.9.1-develop.1',
+    publishDate: 1726064787,
+    version: '16.9.1-develop.3',
     licensingDocsUrl: 'https://www.telerik.com/kendo-angular-ui/my-license/'
 };

package/esm2020/views/utils.mjs

@@ -295,12 +295,13 @@ export const convertNgClassBindings = (bindingValues) => {
  * @hidden
  */
 export function formatEventTime(start, end, isAllDay, localeId) {
-    const startTimeFormat = { skeleton: 'yMMMMEEEEdhm' };
-    const startDateFormat = { skeleton: 'yMMMMEEEEd' };
-    const endFormat = isEqualDate(start, end) ? 't' : startTimeFormat;
+    const dateFormat = { skeleton: 'yMMMMEEEEd' };
+    const timeFormat = 't';
+    const startFormat = formatEventStart(start, dateFormat, timeFormat, isAllDay, localeId);
+    const endFormat = formatEventEnd(start, end, dateFormat, timeFormat, localeId);
     return isAllDay ?
-        `${formatDate(start, startDateFormat, localeId)}` :
-        `${formatDate(start, startTimeFormat, localeId)}–${formatDate(end, endFormat, localeId)}`;
+        `${startFormat}` :
+        `${startFormat}-${endFormat}`;
 }
 /**
  * @hidden
@@ -325,3 +326,26 @@ export const isWorkWeekDay = (day, start, end) => {
  * @hidden
  */
 export const alwaysFalse = () => false;
+/**
+ * @hidden
+ */
+const formatEventStart = (start, dateFormat, timeFormat, isAllDay, localeId) => {
+    let startFormat = `${formatDate(start, dateFormat, localeId)}`;
+    // the time is relevant only when the event isn't an all day event
+    if (!isAllDay) {
+        startFormat += `, ${formatDate(start, timeFormat, localeId)}`;
+    }
+    return startFormat;
+};
+/**
+ * @hidden
+ */
+const formatEventEnd = (start, end, dateFormat, timeFormat, localeId) => {
+    let endFormat = '';
+    // the end date is relevant only when the event ends on a different day from when it starts
+    if (!isEqualDate(start, end)) {
+        endFormat = `${formatDate(end, dateFormat, localeId)}, `;
+    }
+    endFormat += `${formatDate(end, timeFormat, localeId)}`;
+    return endFormat;
+};

package/fesm2015/progress-kendo-angular-scheduler.mjs

@@ -42,8 +42,8 @@ const packageMetadata = {
     name: '@progress/kendo-angular-scheduler',
     productName: 'Kendo UI for Angular',
     productCodes: ['KENDOUIANGULAR', 'KENDOUICOMPLETE'],
-    publishDate: 1726051093,
-    version: '16.9.1-develop.1',
+    publishDate: 1726064787,
+    version: '16.9.1-develop.3',
     licensingDocsUrl: 'https://www.telerik.com/kendo-angular-ui/my-license/'
 };
 
@@ -2283,12 +2283,13 @@ const convertNgClassBindings = (bindingValues) => {
  * @hidden
  */
 function formatEventTime(start, end, isAllDay, localeId) {
-    const startTimeFormat = { skeleton: 'yMMMMEEEEdhm' };
-    const startDateFormat = { skeleton: 'yMMMMEEEEd' };
-    const endFormat = isEqualDate(start, end) ? 't' : startTimeFormat;
+    const dateFormat = { skeleton: 'yMMMMEEEEd' };
+    const timeFormat = 't';
+    const startFormat = formatEventStart(start, dateFormat, timeFormat, isAllDay, localeId);
+    const endFormat = formatEventEnd(start, end, dateFormat, timeFormat, localeId);
     return isAllDay ?
-        `${formatDate(start, startDateFormat, localeId)}` :
-        `${formatDate(start, startTimeFormat, localeId)}–${formatDate(end, endFormat, localeId)}`;
+        `${startFormat}` :
+        `${startFormat}-${endFormat}`;
 }
 /**
  * @hidden
@@ -2313,6 +2314,29 @@ const isWorkWeekDay = (day, start, end) => {
  * @hidden
  */
 const alwaysFalse = () => false;
+/**
+ * @hidden
+ */
+const formatEventStart = (start, dateFormat, timeFormat, isAllDay, localeId) => {
+    let startFormat = `${formatDate(start, dateFormat, localeId)}`;
+    // the time is relevant only when the event isn't an all day event
+    if (!isAllDay) {
+        startFormat += `, ${formatDate(start, timeFormat, localeId)}`;
+    }
+    return startFormat;
+};
+/**
+ * @hidden
+ */
+const formatEventEnd = (start, end, dateFormat, timeFormat, localeId) => {
+    let endFormat = '';
+    // the end date is relevant only when the event ends on a different day from when it starts
+    if (!isEqualDate(start, end)) {
+        endFormat = `${formatDate(end, dateFormat, localeId)}, `;
+    }
+    endFormat += `${formatDate(end, timeFormat, localeId)}`;
+    return endFormat;
+};
 
 /**
  * @hidden
@@ -18048,6 +18072,10 @@ class ShortcutsDirective {
                     if (e.target.tagName === CALENDAR_TAG) {
                         return;
                     }
+                    // do nothing if the shortcut is executed on an element inside the kendoSchedulerToolbarTemplate
+                    if (this.isInToolbarTemplate(e.target)) {
+                        return;
+                    }
                     const prevented = this.scheduler.onNavigationAction({ type: 'focus-prev' });
                     if (!prevented) {
                         const item = this.focusService.activeItem;
@@ -18065,6 +18093,10 @@ class ShortcutsDirective {
                     if (e.target.tagName === CALENDAR_TAG) {
                         return;
                     }
+                    // do nothing if the shortcut is executed on an element inside the kendoSchedulerToolbarTemplate
+                    if (this.isInToolbarTemplate(e.target)) {
+                        return;
+                    }
                     const prevented = this.scheduler.onNavigationAction({ type: 'focus-next' });
                     if (!prevented) {
                         const isInToolbar = this.focusService.activeItem.containerType === 'toolbar';
@@ -18115,6 +18147,13 @@ class ShortcutsDirective {
     focusWait() {
         this.viewState.layoutEnd.pipe(take(1)).subscribe(() => this.focusService.focus());
     }
+    isInToolbarTemplate(element) {
+        const isInToolbar = element.closest('.k-scheduler-toolbar');
+        const isInBuiltInElement = element.closest('.k-toolbar-group') ||
+            element.closest('.k-scheduler-views') ||
+            element.closest('.k-views-dropdown');
+        return isInToolbar && !isInBuiltInElement;
+    }
 }
 ShortcutsDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: ShortcutsDirective, deps: [{ token: SchedulerComponent }, { token: DomEventsService }, { token: FocusService }, { token: i0.NgZone }, { token: i0.ChangeDetectorRef }, { token: ViewStateService }, { token: DialogsService }], target: i0.ɵɵFactoryTarget.Directive });
 ShortcutsDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.2.10", type: ShortcutsDirective, isStandalone: true, selector: "kendo-scheduler", ngImport: i0 });

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

@@ -42,8 +42,8 @@ const packageMetadata = {
     name: '@progress/kendo-angular-scheduler',
     productName: 'Kendo UI for Angular',
     productCodes: ['KENDOUIANGULAR', 'KENDOUICOMPLETE'],
-    publishDate: 1726051093,
-    version: '16.9.1-develop.1',
+    publishDate: 1726064787,
+    version: '16.9.1-develop.3',
     licensingDocsUrl: 'https://www.telerik.com/kendo-angular-ui/my-license/'
 };
 
@@ -2248,12 +2248,13 @@ const convertNgClassBindings = (bindingValues) => {
  * @hidden
  */
 function formatEventTime(start, end, isAllDay, localeId) {
-    const startTimeFormat = { skeleton: 'yMMMMEEEEdhm' };
-    const startDateFormat = { skeleton: 'yMMMMEEEEd' };
-    const endFormat = isEqualDate(start, end) ? 't' : startTimeFormat;
+    const dateFormat = { skeleton: 'yMMMMEEEEd' };
+    const timeFormat = 't';
+    const startFormat = formatEventStart(start, dateFormat, timeFormat, isAllDay, localeId);
+    const endFormat = formatEventEnd(start, end, dateFormat, timeFormat, localeId);
     return isAllDay ?
-        `${formatDate(start, startDateFormat, localeId)}` :
-        `${formatDate(start, startTimeFormat, localeId)}–${formatDate(end, endFormat, localeId)}`;
+        `${startFormat}` :
+        `${startFormat}-${endFormat}`;
 }
 /**
  * @hidden
@@ -2278,6 +2279,29 @@ const isWorkWeekDay = (day, start, end) => {
  * @hidden
  */
 const alwaysFalse = () => false;
+/**
+ * @hidden
+ */
+const formatEventStart = (start, dateFormat, timeFormat, isAllDay, localeId) => {
+    let startFormat = `${formatDate(start, dateFormat, localeId)}`;
+    // the time is relevant only when the event isn't an all day event
+    if (!isAllDay) {
+        startFormat += `, ${formatDate(start, timeFormat, localeId)}`;
+    }
+    return startFormat;
+};
+/**
+ * @hidden
+ */
+const formatEventEnd = (start, end, dateFormat, timeFormat, localeId) => {
+    let endFormat = '';
+    // the end date is relevant only when the event ends on a different day from when it starts
+    if (!isEqualDate(start, end)) {
+        endFormat = `${formatDate(end, dateFormat, localeId)}, `;
+    }
+    endFormat += `${formatDate(end, timeFormat, localeId)}`;
+    return endFormat;
+};
 
 /**
  * @hidden
@@ -17993,6 +18017,10 @@ class ShortcutsDirective {
                     if (e.target.tagName === CALENDAR_TAG) {
                         return;
                     }
+                    // do nothing if the shortcut is executed on an element inside the kendoSchedulerToolbarTemplate
+                    if (this.isInToolbarTemplate(e.target)) {
+                        return;
+                    }
                     const prevented = this.scheduler.onNavigationAction({ type: 'focus-prev' });
                     if (!prevented) {
                         const item = this.focusService.activeItem;
@@ -18010,6 +18038,10 @@ class ShortcutsDirective {
                     if (e.target.tagName === CALENDAR_TAG) {
                         return;
                     }
+                    // do nothing if the shortcut is executed on an element inside the kendoSchedulerToolbarTemplate
+                    if (this.isInToolbarTemplate(e.target)) {
+                        return;
+                    }
                     const prevented = this.scheduler.onNavigationAction({ type: 'focus-next' });
                     if (!prevented) {
                         const isInToolbar = this.focusService.activeItem.containerType === 'toolbar';
@@ -18060,6 +18092,13 @@ class ShortcutsDirective {
     focusWait() {
         this.viewState.layoutEnd.pipe(take(1)).subscribe(() => this.focusService.focus());
     }
+    isInToolbarTemplate(element) {
+        const isInToolbar = element.closest('.k-scheduler-toolbar');
+        const isInBuiltInElement = element.closest('.k-toolbar-group') ||
+            element.closest('.k-scheduler-views') ||
+            element.closest('.k-views-dropdown');
+        return isInToolbar && !isInBuiltInElement;
+    }
 }
 ShortcutsDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: ShortcutsDirective, deps: [{ token: SchedulerComponent }, { token: DomEventsService }, { token: FocusService }, { token: i0.NgZone }, { token: i0.ChangeDetectorRef }, { token: ViewStateService }, { token: DialogsService }], target: i0.ɵɵFactoryTarget.Directive });
 ShortcutsDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.2.10", type: ShortcutsDirective, isStandalone: true, selector: "kendo-scheduler", ngImport: i0 });

package/navigation/shortcuts.directive.d.ts

@@ -27,6 +27,7 @@ export declare class ShortcutsDirective {
     private onKeydown;
     private onEventKeydown;
     private focusWait;
+    private isInToolbarTemplate;
     static ɵfac: i0.ɵɵFactoryDeclaration<ShortcutsDirective, never>;
     static ɵdir: i0.ɵɵDirectiveDeclaration<ShortcutsDirective, "kendo-scheduler", never, {}, {}, never, never, true, never>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@progress/kendo-angular-scheduler",
-  "version": "16.9.1-develop.1",
+  "version": "16.9.1-develop.3",
   "description": "Kendo UI Scheduler Angular - Outlook or Google-style angular scheduler calendar. Full-featured and customizable embedded scheduling from the creator developers trust for professional UI components.",
   "license": "SEE LICENSE IN LICENSE.md",
   "author": "Progress",
@@ -26,23 +26,23 @@
     "@progress/kendo-data-query": "^1.0.0",
     "@progress/kendo-drawing": "^1.19.0",
     "@progress/kendo-licensing": "^1.0.2",
-    "@progress/kendo-angular-tooltip": "16.9.1-develop.1",
-    "@progress/kendo-angular-buttons": "16.9.1-develop.1",
-    "@progress/kendo-angular-common": "16.9.1-develop.1",
-    "@progress/kendo-angular-dateinputs": "16.9.1-develop.1",
-    "@progress/kendo-angular-dialog": "16.9.1-develop.1",
-    "@progress/kendo-angular-dropdowns": "16.9.1-develop.1",
-    "@progress/kendo-angular-icons": "16.9.1-develop.1",
-    "@progress/kendo-angular-inputs": "16.9.1-develop.1",
-    "@progress/kendo-angular-intl": "16.9.1-develop.1",
-    "@progress/kendo-angular-l10n": "16.9.1-develop.1",
-    "@progress/kendo-angular-label": "16.9.1-develop.1",
-    "@progress/kendo-angular-popup": "16.9.1-develop.1",
+    "@progress/kendo-angular-tooltip": "16.9.1-develop.3",
+    "@progress/kendo-angular-buttons": "16.9.1-develop.3",
+    "@progress/kendo-angular-common": "16.9.1-develop.3",
+    "@progress/kendo-angular-dateinputs": "16.9.1-develop.3",
+    "@progress/kendo-angular-dialog": "16.9.1-develop.3",
+    "@progress/kendo-angular-dropdowns": "16.9.1-develop.3",
+    "@progress/kendo-angular-icons": "16.9.1-develop.3",
+    "@progress/kendo-angular-inputs": "16.9.1-develop.3",
+    "@progress/kendo-angular-intl": "16.9.1-develop.3",
+    "@progress/kendo-angular-l10n": "16.9.1-develop.3",
+    "@progress/kendo-angular-label": "16.9.1-develop.3",
+    "@progress/kendo-angular-popup": "16.9.1-develop.3",
     "rxjs": "^6.5.3 || ^7.0.0"
   },
   "dependencies": {
     "tslib": "^2.3.1",
-    "@progress/kendo-angular-schematics": "16.9.1-develop.1",
+    "@progress/kendo-angular-schematics": "16.9.1-develop.3",
     "@progress/kendo-date-math": "^1.3.2",
     "@progress/kendo-draggable": "^3.0.2",
     "@progress/kendo-file-saver": "^1.0.7",

package/schematics/ngAdd/index.js

@@ -4,10 +4,10 @@ const schematics_1 = require("@angular-devkit/schematics");
 function default_1(options) {
     const finalOptions = Object.assign(Object.assign({}, options), { mainNgModule: 'SchedulerModule', package: 'scheduler', peerDependencies: {
             // peer deps of the dropdowns
-            '@progress/kendo-angular-treeview': '16.9.1-develop.1',
-            '@progress/kendo-angular-navigation': '16.9.1-develop.1',
+            '@progress/kendo-angular-treeview': '16.9.1-develop.3',
+            '@progress/kendo-angular-navigation': '16.9.1-develop.3',
             // peer dependency of kendo-angular-inputs
-            '@progress/kendo-angular-dialog': '16.9.1-develop.1',
+            '@progress/kendo-angular-dialog': '16.9.1-develop.3',
             // peer dependency of kendo-angular-icons
             '@progress/kendo-svg-icons': '^3.0.0'
         } });