@syncfusion/ej2-schedule 31.2.2 → 31.2.10

package/dist/es6/ej2-schedule.es2015.js

@@ -7899,23 +7899,28 @@ class VerticalEvent extends EventBase {
             }
             const queue = [];
             this.overlapList.forEach((obj) => {
-                queue.push(obj);
                 let filterList = [];
                 const processedIds = new Set();
+                queue.push(obj);
+                processedIds.add(obj[fieldMapping.id]);
+                filterList.push(obj);
                 while (queue.length > 0) {
                     const currentObj = queue.shift();
-                    const overlaps = appointmentList.filter((data) => {
-                        return data[fieldMapping.endTime] > currentObj[fieldMapping.startTime] &&
-                            data[fieldMapping.startTime] <= currentObj[fieldMapping.endTime] &&
-                            !processedIds.has(data[fieldMapping.id]);
-                    });
-                    overlaps.forEach((overlap) => {
-                        filterList.push(overlap);
-                        processedIds.add(overlap[fieldMapping.id]);
-                        queue.push(overlap);
-                    });
-                    if (processedIds.size < appointmentList.length - 1) {
-                        break;
+                    const currentObjEndTime = currentObj[fieldMapping.endTime].getTime();
+                    const currentObjStartTime = currentObj[fieldMapping.startTime].getTime();
+                    for (const data of appointmentList) {
+                        const dataStartTime = data[fieldMapping.startTime].getTime();
+                        const dataEndTime = data[fieldMapping.endTime].getTime();
+                        if (dataStartTime >= currentObjEndTime) {
+                            break;
+                        }
+                        if (!processedIds.has(data[fieldMapping.id])) {
+                            if (dataEndTime > currentObjStartTime && dataStartTime < currentObjEndTime) {
+                                filterList.push(data);
+                                processedIds.add(data[fieldMapping.id]);
+                                queue.push(data);
+                            }
+                        }
                     }
                 }
                 if (this.parent.activeViewOptions.group.resources.length > 0) {
@@ -27243,6 +27248,9 @@ class Agenda extends AgendaBase {
         const tBody = target.querySelector('tbody');
         const emptyTBody = createElement('tbody');
         const topElement = this.getElementFromScrollerPosition(event);
+        if (!topElement) {
+            return;
+        }
         const scrollDate = this.parent.getDateFromElement(topElement);
         let filterDate;
         let filterData;