@progress/kendo-angular-scheduler 25.4.0-develop.4 → 25.4.0-develop.6

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

@@ -44,8 +44,8 @@ const packageMetadata = {
     productName: 'Kendo UI for Angular',
     productCode: 'KENDOUIANGULAR',
     productCodes: ['KENDOUIANGULAR'],
-    publishDate: 1792070988,
-    version: '25.4.0-develop.4',
+    publishDate: 1792137000,
+    version: '25.4.0-develop.6',
     licensingDocsUrl: 'https://www.telerik.com/kendo-angular-ui/my-license/'
 };
 
@@ -2944,7 +2944,8 @@ function isRecurrenceException(task) {
     return task.event && isPresent(task.event.recurrenceId) && !task.event.recurrenceRule;
 }
 /** @hidden */
-const rectContains = (rect, left, top, scaleX = 1) => rect.left * scaleX <= left && left <= rect.left * scaleX + rect.width * scaleX && rect.top * scaleX <= top && top <= rect.top * scaleX + rect.height * scaleX;
+const rectContains = (rect, left, top, scaleX = 1, scaleY = 1) => rect.left * scaleX <= left && left <= rect.left * scaleX + rect.width * scaleX &&
+    rect.top * scaleY <= top && top <= rect.top * scaleY + rect.height * scaleY;
 /** @hidden */
 const rectContainsX = (rect, left, scaleX = 1) => rect.left * scaleX <= left && left <= rect.left * scaleX + rect.width * scaleX;
 /** @hidden */
@@ -12757,6 +12758,7 @@ class BaseSlotService {
     containerSize = 0;
     slotsChange = new EventEmitter();
     groups = [];
+    schedulerElement = null;
     registerItem(component) {
         const group = this.itemGroup(component);
         group.registerItem(component);
@@ -12773,6 +12775,9 @@ class BaseSlotService {
         }
     }
     registerSlot(slot) {
+        if (slot.nativeElement) {
+            this.schedulerElement = slot.nativeElement.closest('.k-scheduler');
+        }
         const group = this.slotGroup(slot);
         group.registerSlot(slot);
     }
@@ -12817,13 +12822,17 @@ class BaseSlotService {
         }
         return this.groups[index];
     }
-    calculateScaleX() {
+    calculateScale(axis) {
         if (!isDocumentAvailable()) {
             return;
         }
-        const schedulerEl = document.querySelector('.k-scheduler');
-        const scaleX = schedulerEl.getBoundingClientRect().width / schedulerEl.offsetWidth;
-        return scaleX;
+        const schedulerEl = this.schedulerElement?.closest('.k-scheduler');
+        if (!schedulerEl) {
+            return;
+        }
+        const bounds = schedulerEl.getBoundingClientRect();
+        const scale = axis === 'x' ? bounds.width / schedulerEl.offsetWidth : bounds.height / schedulerEl.offsetHeight;
+        return scale;
     }
 }
 
@@ -13161,11 +13170,13 @@ class MonthSlotService extends BaseSlotService {
     }
     slotByPosition(x, y) {
         let range;
+        const scaleX = this.calculateScale('x');
+        const scaleY = this.calculateScale('y');
         for (let i = 0; i < this.groups.length; i++) {
             const group = this.groups[i];
-            range = group.dayRanges.find(r => rectContains(r.rect, x, y, this.calculateScaleX()));
+            range = group.dayRanges.find(r => rectContains(r.rect, x, y, scaleX, scaleY));
             if (range) {
-                return range.slots.find(slot => rectContains(slot.rect, x, y, this.calculateScaleX()));
+                return range.slots.find(slot => rectContains(slot.rect, x, y, scaleX, scaleY));
             }
         }
     }
@@ -13187,9 +13198,11 @@ class MonthSlotService extends BaseSlotService {
         };
     }
     groupSlotByPosition(currentSlot, x, y) {
-        const range = this.groups[currentSlot.id.resourceIndex].dayRanges.find(r => rectContains(r.rect, x, y, this.calculateScaleX()));
+        const scaleX = this.calculateScale('x');
+        const scaleY = this.calculateScale('y');
+        const range = this.groups[currentSlot.id.resourceIndex].dayRanges.find(r => rectContains(r.rect, x, y, scaleX, scaleY));
         if (range) {
-            return range.slots.find(slot => rectContains(slot.rect, x, y, this.calculateScaleX()));
+            return range.slots.find(slot => rectContains(slot.rect, x, y, scaleX, scaleY));
         }
     }
     resizeRanges(currentSlot, task, resizeStart, offset) {
@@ -14063,19 +14076,21 @@ class BaseView {
         this.updateDragContainer(args);
         const eventRect = resizing.target.getBoundingClientRect();
         const handleOffset = 2;
+        const pageOffsetX = args.pageX - args.clientX;
+        const pageOffsetY = args.pageY - args.clientY;
         let pageX = args.pageX;
         let pageY = args.pageY;
         if (resizing.direction === 'w') {
-            pageX = eventRect.left + handleOffset;
+            pageX = eventRect.left + pageOffsetX + handleOffset;
         }
         else if (resizing.direction === 'e') {
-            pageX = eventRect.right - handleOffset;
+            pageX = eventRect.right + pageOffsetX - handleOffset;
         }
         else if (resizing.direction === 'n') {
-            pageY = eventRect.top + handleOffset;
+            pageY = eventRect.top + pageOffsetY + handleOffset;
         }
         else if (resizing.direction === 's') {
-            pageY = eventRect.bottom - handleOffset;
+            pageY = eventRect.bottom + pageOffsetY - handleOffset;
         }
         const { x, y } = this.coordinatesOffset(pageX, pageY);
         resizing.slot = this.slotByPosition(Math.ceil(x), Math.ceil(y), this.container);
@@ -14140,10 +14155,14 @@ class BaseView {
         }
     }
     coordinatesOffset(x, y, container = this.container, offset = this.containerOffset) {
-        const position = x - offset.left + container.scrollLeft;
+        const schedulerEl = container?.closest('.k-scheduler');
+        const schedulerRect = schedulerEl?.getBoundingClientRect();
+        const scaleX = schedulerRect ? schedulerRect.width / schedulerEl.offsetWidth : 1;
+        const scaleY = schedulerRect ? schedulerRect.height / schedulerEl.offsetHeight : 1;
+        const position = x - offset.left + container.scrollLeft * scaleX;
         return {
             x: !this.localization.rtl ? position : this.slotService.containerSize - position,
-            y: y - offset.top + container.scrollTop
+            y: y - offset.top + container.scrollTop * scaleY
         };
     }
     scrollContainer(callback, args) {
@@ -17089,6 +17108,7 @@ function addMinHeightOverflowEvents(sorted, slots, slotItems) {
 function initTimeColumns(slotKeys, slotItems) {
     // Break slots into groups with overlapping events.
     let columns = 0;
+    let maxGroupColumns = 0;
     let groupSlots = [];
     slotKeys.forEach(key => {
         const { slot, events } = slotItems[key];
@@ -17185,14 +17205,24 @@ function initTimeColumns(slotKeys, slotItems) {
                 event.columnIndex = maxColumn + 1;
             }
         }
+        const slotColumnCount = events.reduce((maximumColumnCount, event) => {
+            const eventColumnIndex = event.columnIndex;
+            if (!isNumber(eventColumnIndex)) {
+                return maximumColumnCount;
+            }
+            const eventColumnCount = eventColumnIndex + 1;
+            return Math.max(maximumColumnCount, eventColumnCount);
+        }, 0);
+        maxGroupColumns = Math.max(maxGroupColumns, slotColumnCount);
         if (groupEnd) {
-            groupSlots.forEach(item => item.columns = columns);
+            groupSlots.forEach(item => item.columns = Math.max(columns, maxGroupColumns));
             groupSlots = [];
             columns = 0;
+            maxGroupColumns = 0;
         }
     });
     // The maximum number of overlapping events in the group is used to create the same number of columns.
-    groupSlots.forEach(slot => slot.columns = columns);
+    groupSlots.forEach(slot => slot.columns = Math.max(columns, maxGroupColumns));
 }
 function findTimeRowIndex(events, event) {
     if (event.rowIndex !== undefined) {
@@ -17593,38 +17623,42 @@ class DayTimeSlotService extends BaseSlotService {
     slotByPosition(x, y, isDaySlot, includeDayRanges) {
         if (isDaySlot) {
             for (let i = 0; i < this.groups.length; i++) {
-                const foundRange = this.groups[i].dayRanges.find(r => rectContainsX(r.rect, x, this.calculateScaleX()));
+                const foundRange = this.groups[i].dayRanges.find(r => rectContainsX(r.rect, x, this.calculateScale('x')));
                 if (foundRange) {
-                    return foundRange.slots.find(slot => rectContainsX(slot.rect, x, this.calculateScaleX()));
+                    return foundRange.slots.find(slot => rectContainsX(slot.rect, x, this.calculateScale('x')));
                 }
             }
         }
         else {
+            const scaleX = this.calculateScale('x');
+            const scaleY = this.calculateScale('y');
             for (let i = 0; i < this.groups.length; i++) {
                 let range;
                 if (includeDayRanges) {
-                    range = this.groups[i].dayRanges.find(r => rectContains(r.rect, x, y, this.calculateScaleX()));
+                    range = this.groups[i].dayRanges.find(r => rectContains(r.rect, x, y, scaleX, scaleY));
                 }
                 if (!range) {
-                    range = this.groups[i].timeRanges.find(r => rectContains(r.rect, x, y, this.calculateScaleX()));
+                    range = this.groups[i].timeRanges.find(r => rectContains(r.rect, x, y, scaleX, scaleY));
                 }
                 if (range) {
-                    return range.slots.find(slot => rectContains(slot.rect, x, y, this.calculateScaleX()));
+                    return range.slots.find(slot => rectContains(slot.rect, x, y, scaleX, scaleY));
                 }
             }
         }
     }
     groupSlotByPosition(currentSlot, x, y) {
         const group = this.groups[currentSlot.id.resourceIndex];
+        const scaleX = this.calculateScale('x');
+        const scaleY = this.calculateScale('y');
         let range;
         if (currentSlot.isDaySlot) {
-            range = group.dayRanges.find(r => rectContains(r.rect, x, y, this.calculateScaleX()));
+            range = group.dayRanges.find(r => rectContains(r.rect, x, y, scaleX, scaleY));
         }
         else {
-            range = group.timeRanges.find(r => rectContains(r.rect, x, y, this.calculateScaleX()));
+            range = group.timeRanges.find(r => rectContains(r.rect, x, y, scaleX, scaleY));
         }
         if (range) {
-            return range.slots.find(slot => rectContains(slot.rect, x, y, this.calculateScaleX()));
+            return range.slots.find(slot => rectContains(slot.rect, x, y, scaleX, scaleY));
         }
     }
     dragRanges(currentSlot, offset, timeRanges) {

package/index.d.ts

@@ -6143,6 +6143,7 @@ interface SlotDirective {
     rect: Rect;
     id: SlotID;
     key: string;
+    nativeElement?: HTMLElement;
     invalidate(): void;
 }
 /**
@@ -6174,6 +6175,7 @@ declare abstract class BaseSlotService {
     containerSize: number;
     slotsChange: EventEmitter<any>;
     protected groups: ResourceGroup[];
+    private schedulerElement;
     abstract forEachSlot(callback: any): void;
     abstract createGroup(index: number): ResourceGroup;
     abstract resizeRanges(currentSlot: any, task: any, resizeStart: boolean, offset?: any): any;
@@ -6187,7 +6189,7 @@ declare abstract class BaseSlotService {
     protected clearEmptyGroups(): void;
     protected itemGroup(item: ViewItem): ResourceGroup;
     protected slotGroup(slot: SlotDirective): ResourceGroup;
-    protected calculateScaleX(): number;
+    protected calculateScale(axis: 'x' | 'y'): number;
 }
 
 /** @hidden */

package/package-metadata.mjs

@@ -7,7 +7,7 @@ export const packageMetadata = {
   "productCodes": [
     "KENDOUIANGULAR"
   ],
-  "publishDate": 1792070988,
-  "version": "25.4.0-develop.4",
+  "publishDate": 1792137000,
+  "version": "25.4.0-develop.6",
   "licensingDocsUrl": "https://www.telerik.com/kendo-angular-ui/my-license/"
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@progress/kendo-angular-scheduler",
-  "version": "25.4.0-develop.4",
+  "version": "25.4.0-develop.6",
   "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",
@@ -80,7 +80,7 @@
     "package": {
       "productName": "Kendo UI for Angular",
       "productCode": "KENDOUIANGULAR",
-      "publishDate": 1792070988,
+      "publishDate": 1792137000,
       "licensingDocsUrl": "https://www.telerik.com/kendo-angular-ui/my-license/"
     }
   },
@@ -93,23 +93,23 @@
     "@progress/kendo-data-query": "^1.7.3",
     "@progress/kendo-drawing": "^1.25.0",
     "@progress/kendo-licensing": "^1.11.0",
-    "@progress/kendo-angular-tooltip": "25.4.0-develop.4",
-    "@progress/kendo-angular-buttons": "25.4.0-develop.4",
-    "@progress/kendo-angular-common": "25.4.0-develop.4",
-    "@progress/kendo-angular-dateinputs": "25.4.0-develop.4",
-    "@progress/kendo-angular-dialog": "25.4.0-develop.4",
-    "@progress/kendo-angular-dropdowns": "25.4.0-develop.4",
-    "@progress/kendo-angular-icons": "25.4.0-develop.4",
-    "@progress/kendo-angular-inputs": "25.4.0-develop.4",
-    "@progress/kendo-angular-intl": "25.4.0-develop.4",
-    "@progress/kendo-angular-l10n": "25.4.0-develop.4",
-    "@progress/kendo-angular-label": "25.4.0-develop.4",
-    "@progress/kendo-angular-popup": "25.4.0-develop.4",
+    "@progress/kendo-angular-tooltip": "25.4.0-develop.6",
+    "@progress/kendo-angular-buttons": "25.4.0-develop.6",
+    "@progress/kendo-angular-common": "25.4.0-develop.6",
+    "@progress/kendo-angular-dateinputs": "25.4.0-develop.6",
+    "@progress/kendo-angular-dialog": "25.4.0-develop.6",
+    "@progress/kendo-angular-dropdowns": "25.4.0-develop.6",
+    "@progress/kendo-angular-icons": "25.4.0-develop.6",
+    "@progress/kendo-angular-inputs": "25.4.0-develop.6",
+    "@progress/kendo-angular-intl": "25.4.0-develop.6",
+    "@progress/kendo-angular-l10n": "25.4.0-develop.6",
+    "@progress/kendo-angular-label": "25.4.0-develop.6",
+    "@progress/kendo-angular-popup": "25.4.0-develop.6",
     "rxjs": "^6.5.3 || ^7.0.0"
   },
   "dependencies": {
     "tslib": "^2.3.1",
-    "@progress/kendo-angular-schematics": "25.4.0-develop.4",
+    "@progress/kendo-angular-schematics": "25.4.0-develop.6",
     "@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

@@ -9,10 +9,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': '25.4.0-develop.4',
-            '@progress/kendo-angular-navigation': '25.4.0-develop.4',
+            '@progress/kendo-angular-treeview': '25.4.0-develop.6',
+            '@progress/kendo-angular-navigation': '25.4.0-develop.6',
             // peer dependency of kendo-angular-inputs
-            '@progress/kendo-angular-dialog': '25.4.0-develop.4',
+            '@progress/kendo-angular-dialog': '25.4.0-develop.6',
             // peer dependency of kendo-angular-icons
             '@progress/kendo-svg-icons': '^4.0.0'
         } });