@acorex/components 19.14.2 → 19.14.3

package/fesm2022/acorex-components-scheduler.mjs

@@ -11,7 +11,7 @@ import { AXTranslatorPipe, AXTranslationService } from '@acorex/core/translation
 import { AXUnsubscriber, AXHtmlUtil } from '@acorex/core/utils';
 import { AsyncPipe, isPlatformBrowser, NgClass } from '@angular/common';
 import * as i0 from '@angular/core';
-import { inject, Injectable, input, computed, output, HostBinding, ViewEncapsulation, ChangeDetectionStrategy, Component, PLATFORM_ID, viewChild, linkedSignal, signal, model, effect, untracked, NgModule } from '@angular/core';
+import { inject, Injectable, input, computed, output, HostBinding, ViewEncapsulation, ChangeDetectionStrategy, Component, PLATFORM_ID, viewChild, linkedSignal, signal, model, effect, NgModule } from '@angular/core';
 import * as i1 from '@angular/forms';
 import { FormsModule } from '@angular/forms';
 import { AXDragDirective, AXDropZoneDirective } from '@acorex/cdk/drag-drop';
@@ -2007,10 +2007,6 @@ class AXSchedulerComponent extends NXComponent {
         this.calendarType = linkedSignal(() => this.calendar() ?? this.localeService.activeProfile().calendar.system);
         this.startingDate = input(new Date());
         this.currentDate = linkedSignal(() => this.calendarService.create(this.startingDate(), this.calendarType()).startOf('day'));
-        this._endRange = signal(null);
-        this.endRange = this._endRange.asReadonly();
-        this._fromRange = signal(null);
-        this.fromRange = this._fromRange.asReadonly();
         this._appointments = signal([]);
         this.appointments = this._appointments.asReadonly();
         this.rtl = signal(false);
@@ -2048,12 +2044,11 @@ class AXSchedulerComponent extends NXComponent {
         this.#appointmentEffect = effect(async () => {
             if (typeof this.dataSource() === 'function') {
                 const func = this.dataSource();
-                const list = await func({
-                    range: {
-                        end: this.endRange(),
-                        from: this.fromRange(),
-                    },
-                });
+                const range = {
+                    end: this.range().end,
+                    from: this.range().from,
+                };
+                const list = await func({ range });
                 this._appointments.set(list);
             }
             else {
@@ -2111,7 +2106,6 @@ class AXSchedulerComponent extends NXComponent {
                 case 'month':
                 case 'timeline-month':
                     return 'month';
-                    return 'day';
             }
         });
         this.mappedAppointments = computed(() => {
@@ -2146,66 +2140,51 @@ class AXSchedulerComponent extends NXComponent {
             })
                 .filter((appt) => appt !== null); // Filter out nulls from invalid dates
         });
-        this.viewAppointments = computed(() => {
+        this.range = computed(() => {
             const view = this.selectedView();
-            const current = this.currentDate();
-            const mapped = this.mappedAppointments();
-            if (!current || mapped.length === 0)
-                return [];
+            const current = this.currentDate().startOf('day');
+            if (!current)
+                return { from: null, end: null };
             switch (view) {
                 case 'day':
                 case 'timeline-day': {
-                    const dayEnd = current.endOf('day');
-                    const dayStart = current.startOf('day');
-                    untracked(() => {
-                        this._endRange.set(dayEnd.date);
-                        this._fromRange.set(dayStart.date);
-                        this.onRangeChanged.emit({ from: dayStart.date, to: dayEnd.date });
-                    });
-                    return mapped.filter((appt) => appt.endDate.compare(dayStart, 'day') >= 0 && appt.startDate.compare(dayEnd, 'day') <= 0);
+                    const range = { from: current.date, end: current.endOf('day').date };
+                    this.onRangeChanged.emit(range);
+                    return range;
                 }
                 case 'week': {
-                    const weekStart = current;
-                    const weekEnd = weekStart.add('day', 7);
-                    untracked(() => {
-                        this._endRange.set(weekEnd.date);
-                        this._fromRange.set(weekStart.date);
-                        this.onRangeChanged.emit({ from: weekStart.date, to: weekEnd.date });
-                    });
-                    return mapped.filter((appt) => appt.startDate.compare(weekEnd, 'day') < 0 && appt.endDate.compare(weekStart, 'day') >= 0);
+                    const range = { from: current.date, end: current.add('day', 7).date };
+                    this.onRangeChanged.emit(range);
+                    return range;
                 }
                 case 'month': {
                     const { gridStartDate, gridEndDate } = this.getGridDateRange(current);
-                    const exclusiveGridEndDate = gridEndDate.add('day', 1);
-                    untracked(() => {
-                        this._endRange.set(exclusiveGridEndDate.date);
-                        this._fromRange.set(gridStartDate.date);
-                    });
-                    return mapped.filter((appt) => appt.startDate.compare(exclusiveGridEndDate, 'day') < 0 && appt.endDate.compare(gridStartDate, 'day') >= 0);
+                    const range = { from: gridStartDate.date, end: gridEndDate.add('day', 1).date };
+                    this.onRangeChanged.emit(range);
+                    return range;
                 }
                 case 'timeline-month': {
-                    const dayStart = current.startOf('month');
-                    const dayEnd = dayStart.endOf('month');
-                    untracked(() => {
-                        this._endRange.set(dayEnd.date);
-                        this._fromRange.set(dayStart.date);
-                        this.onRangeChanged.emit({ from: dayStart.date, to: dayEnd.date });
-                    });
-                    return mapped.filter((appt) => appt.startDate.compare(dayEnd, 'day') < 0 && appt.endDate.compare(dayStart, 'day') >= 0);
+                    const range = { from: current.startOf('month').date, end: current.endOf('month').date };
+                    this.onRangeChanged.emit(range);
+                    return range;
                 }
                 case 'agenda':
                 case 'timeline-multi-day': {
-                    const dayStart = current;
-                    const dayEnd = dayStart.add('day', this.multiDayViewDaysCount());
-                    untracked(() => {
-                        this._endRange.set(dayEnd.date);
-                        this._fromRange.set(dayStart.date);
-                        this.onRangeChanged.emit({ from: dayStart.date, to: dayEnd.date });
-                    });
-                    return mapped.filter((appt) => appt.startDate.compare(dayEnd, 'day') < 0 && appt.endDate.compare(dayStart, 'day') >= 0);
+                    const range = { from: current.date, end: current.add('day', this.multiDayViewDaysCount()).date };
+                    this.onRangeChanged.emit(range);
+                    return range;
                 }
             }
         });
+        this.viewAppointments = computed(() => {
+            const current = this.currentDate();
+            const mapped = this.mappedAppointments();
+            const rangeStart = this.range().from;
+            const rangeEnd = this.range().end;
+            if (!current || mapped.length === 0)
+                return [];
+            return mapped.filter((appt) => appt.startDate.compare(rangeEnd, 'second') <= 0 && appt.endDate.compare(rangeStart, 'second') >= 0);
+        });
     }
     // --- Internal Handlers for View Outputs ---
     handleSlotClickInternal(eventData) {