@progress/kendo-angular-scheduler 23.3.0-develop.16 → 23.3.0-develop.17

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

@@ -43,8 +43,8 @@ const packageMetadata = {
     productName: 'Kendo UI for Angular',
     productCode: 'KENDOUIANGULAR',
     productCodes: ['KENDOUIANGULAR'],
-    publishDate: 1774537237,
-    version: '23.3.0-develop.16',
+    publishDate: 1774600251,
+    version: '23.3.0-develop.17',
     licensingDocsUrl: 'https://www.telerik.com/kendo-angular-ui/my-license/'
 };
 
@@ -15840,6 +15840,42 @@ const columnIndexComparer = (a, b) => {
     }
     return indexA - indexB;
 };
+function addMinHeightOverflowEvents(sorted, slots, slotItems) {
+    const firstSlot = slots[0];
+    if (!firstSlot || slots.length <= 1) {
+        return;
+    }
+    const slotDurationMs = firstSlot.end.getTime() - firstSlot.start.getTime();
+    const slotHeight = firstSlot.height;
+    if (slotDurationMs <= 0 || slotHeight <= 0) {
+        return;
+    }
+    const msPerPixel = slotDurationMs / slotHeight;
+    const minEventDurationMs = MIN_EVENT_HEIGHT * msPerPixel;
+    sorted.forEach(event => {
+        const eventDurationMs = event.item.endTime.getTime() - event.item.startTime.getTime();
+        if (eventDurationMs >= minEventDurationMs) {
+            return;
+        }
+        const visualEndMs = event.item.startTime.getTime() + minEventDurationMs;
+        const endMs = event.item.endTime.getTime();
+        for (let i = 0; i < slots.length; i++) {
+            const slot = slots[i];
+            if (slot.end.getTime() <= endMs) {
+                continue;
+            }
+            if (slot.start.getTime() >= visualEndMs) {
+                break;
+            }
+            if (intersects(event.item.startTime, event.item.endTime, slot.start, slot.end)) {
+                continue;
+            }
+            const value = slotItems[slot.key] = slotItems[slot.key] || { events: [] };
+            value.slot = slot;
+            value.events.push(event);
+        }
+    });
+}
 function initTimeColumns(slotKeys, slotItems) {
     // Break slots into groups with overlapping events.
     let columns = 0;
@@ -15853,7 +15889,14 @@ function initTimeColumns(slotKeys, slotItems) {
         groupSlots.push(slot);
         for (let eventIdx = 0; eventIdx < count; eventIdx++) {
             const event = events[eventIdx];
-            groupEnd = groupEnd && event.item.endTime.getTime() <= slot.end.getTime();
+            const endsInSlot = event.item.endTime.getTime() <= slot.end.getTime();
+            // Grouping needs to consider the enforced minimum rendered height with MIN_EVENT_HEIGHT.
+            let visuallyEndsInSlot = true;
+            if (endsInSlot) {
+                const eventTop = event.rect ? event.rect.top : (slot.rect.top + timeOffset(slot, event.item.startTime));
+                visuallyEndsInSlot = eventTop + MIN_EVENT_HEIGHT <= slot.rect.top + slot.rect.height;
+            }
+            groupEnd = groupEnd && endsInSlot && visuallyEndsInSlot;
             if (isNumber(event.columnIndex)) {
                 continue;
             }
@@ -15862,6 +15905,7 @@ function initTimeColumns(slotKeys, slotItems) {
             };
             event.columnIndex = eventIdx;
             event.lastColumn = true;
+            let columnFound = false;
             for (let idx = 0, previousIdx = -1; idx < eventIdx; idx++) {
                 const current = events[idx];
                 if (current.columnIndex > previousIdx + 1) {
@@ -15869,9 +15913,10 @@ function initTimeColumns(slotKeys, slotItems) {
                     event.lastColumn = false;
                     events.splice(eventIdx, 1);
                     events.splice(event.columnIndex, 0, event);
+                    columnFound = true;
                     break;
                 }
-                //events that don't intersect their start or end times but overlap in rendered height due to the minimum event height
+                // Events that don't intersect their start or end times but overlap in rendered height due to the minimum event height
                 const anyOverlappingEvents = events.filter(e => e !== current && e.rect).some(event => {
                     const areIntersecting = intersects(event.item.startTime, event.item.endTime, current.item.startTime, current.item.endTime);
                     const areOverlapping = minHeightOverlaps(current.rect.top, event.rect.top);
@@ -15880,6 +15925,18 @@ function initTimeColumns(slotKeys, slotItems) {
                 const intersectingEvents = intersects(event.item.startTime, event.item.endTime, current.item.startTime, current.item.endTime);
                 const overlappingEvents = minHeightOverlaps(current.rect.top, event.rect.top);
                 if (!(anyOverlappingEvents || intersectingEvents || overlappingEvents)) {
+                    const targetColumn = current.columnIndex;
+                    // Verify no other event in the same column overlaps with the new event
+                    const hasColumnConflict = events.some(e => e !== current &&
+                        isNumber(e.columnIndex) &&
+                        e.columnIndex === targetColumn &&
+                        (intersects(event.item.startTime, event.item.endTime, e.item.startTime, e.item.endTime) ||
+                            (e.rect && event.rect && minHeightOverlaps(e.rect.top, event.rect.top))));
+                    if (hasColumnConflict) {
+                        previousIdx = current.columnIndex;
+                        current.lastColumn = false;
+                        continue;
+                    }
                     const currentSlotDay = new Date(slot.start).toDateString();
                     const hasPreviousSlotsWithMoreOrSameColumns = slotKeys.some(previousKey => {
                         const previousSlot = slotItems[previousKey].slot;
@@ -15891,20 +15948,32 @@ function initTimeColumns(slotKeys, slotItems) {
                     if (!hasPreviousSlotsWithMoreOrSameColumns) {
                         columns--;
                     }
-                    event.columnIndex = idx;
+                    event.columnIndex = targetColumn;
                     event.lastColumn = !events.some((e) => {
                         const hasColumnIndex = e.columnIndex;
-                        const isBeforeCurrentIndex = idx < e.columnIndex;
+                        const isBeforeCurrentIndex = targetColumn < e.columnIndex;
                         const areIntersecting = intersects(event.item.startTime, event.item.endTime, e.item.startTime, e.item.endTime);
                         return hasColumnIndex && isBeforeCurrentIndex && areIntersecting;
                     });
                     events.splice(eventIdx, 1);
                     events.splice(idx, 0, event);
+                    columnFound = true;
                     break;
                 }
                 previousIdx = current.columnIndex;
                 current.lastColumn = false;
             }
+            // After splice operations, array positions may not match column indices.
+            // Recalculate the column index based on the highest occupied column.
+            if (!columnFound) {
+                let maxColumn = -1;
+                for (let i = 0; i < eventIdx; i++) {
+                    if (isNumber(events[i].columnIndex) && events[i].columnIndex > maxColumn) {
+                        maxColumn = events[i].columnIndex;
+                    }
+                }
+                event.columnIndex = maxColumn + 1;
+            }
         }
         if (groupEnd) {
             groupSlots.forEach(item => item.columns = columns);
@@ -16076,6 +16145,7 @@ class SlotRange {
             value.slot = slot;
             value.events.push(event);
         }));
+        addMinHeightOverflowEvents(sorted, slots, slotItems);
         const slotKeys = Object.keys(slotItems);
         initTimeColumns(slotKeys, slotItems);
         slotKeys.forEach((key) => {

package/package-metadata.mjs

@@ -7,7 +7,7 @@ export const packageMetadata = {
   "productCodes": [
     "KENDOUIANGULAR"
   ],
-  "publishDate": 1774537237,
-  "version": "23.3.0-develop.16",
+  "publishDate": 1774600251,
+  "version": "23.3.0-develop.17",
   "licensingDocsUrl": "https://www.telerik.com/kendo-angular-ui/my-license/"
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@progress/kendo-angular-scheduler",
-  "version": "23.3.0-develop.16",
+  "version": "23.3.0-develop.17",
   "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",
@@ -19,7 +19,7 @@
     "package": {
       "productName": "Kendo UI for Angular",
       "productCode": "KENDOUIANGULAR",
-      "publishDate": 1774537237,
+      "publishDate": 1774600251,
       "licensingDocsUrl": "https://www.telerik.com/kendo-angular-ui/my-license/"
     }
   },
@@ -32,23 +32,23 @@
     "@progress/kendo-data-query": "^1.7.3",
     "@progress/kendo-drawing": "^1.24.1",
     "@progress/kendo-licensing": "^1.10.0",
-    "@progress/kendo-angular-tooltip": "23.3.0-develop.16",
-    "@progress/kendo-angular-buttons": "23.3.0-develop.16",
-    "@progress/kendo-angular-common": "23.3.0-develop.16",
-    "@progress/kendo-angular-dateinputs": "23.3.0-develop.16",
-    "@progress/kendo-angular-dialog": "23.3.0-develop.16",
-    "@progress/kendo-angular-dropdowns": "23.3.0-develop.16",
-    "@progress/kendo-angular-icons": "23.3.0-develop.16",
-    "@progress/kendo-angular-inputs": "23.3.0-develop.16",
-    "@progress/kendo-angular-intl": "23.3.0-develop.16",
-    "@progress/kendo-angular-l10n": "23.3.0-develop.16",
-    "@progress/kendo-angular-label": "23.3.0-develop.16",
-    "@progress/kendo-angular-popup": "23.3.0-develop.16",
+    "@progress/kendo-angular-tooltip": "23.3.0-develop.17",
+    "@progress/kendo-angular-buttons": "23.3.0-develop.17",
+    "@progress/kendo-angular-common": "23.3.0-develop.17",
+    "@progress/kendo-angular-dateinputs": "23.3.0-develop.17",
+    "@progress/kendo-angular-dialog": "23.3.0-develop.17",
+    "@progress/kendo-angular-dropdowns": "23.3.0-develop.17",
+    "@progress/kendo-angular-icons": "23.3.0-develop.17",
+    "@progress/kendo-angular-inputs": "23.3.0-develop.17",
+    "@progress/kendo-angular-intl": "23.3.0-develop.17",
+    "@progress/kendo-angular-l10n": "23.3.0-develop.17",
+    "@progress/kendo-angular-label": "23.3.0-develop.17",
+    "@progress/kendo-angular-popup": "23.3.0-develop.17",
     "rxjs": "^6.5.3 || ^7.0.0"
   },
   "dependencies": {
     "tslib": "^2.3.1",
-    "@progress/kendo-angular-schematics": "23.3.0-develop.16",
+    "@progress/kendo-angular-schematics": "23.3.0-develop.17",
     "@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': '23.3.0-develop.16',
-            '@progress/kendo-angular-navigation': '23.3.0-develop.16',
+            '@progress/kendo-angular-treeview': '23.3.0-develop.17',
+            '@progress/kendo-angular-navigation': '23.3.0-develop.17',
             // peer dependency of kendo-angular-inputs
-            '@progress/kendo-angular-dialog': '23.3.0-develop.16',
+            '@progress/kendo-angular-dialog': '23.3.0-develop.17',
             // peer dependency of kendo-angular-icons
             '@progress/kendo-svg-icons': '^4.0.0'
         } });