@dereekb/date 10.1.5 → 10.1.6

package/index.cjs.js

@@ -5805,9 +5805,20 @@ function dateCellDayTimingInfoFactory(config) {
     const startsAtOnDay = startsAtFactory(dayIndex); // convert back to the proper date
     const endsAtOnDay = dateFns.addMinutes(startsAtOnDay, duration);
     const potentiallyInProgress = !dateFns.isAfter(startsAtOnDay, now); // is potentially in progress if the now is equal-to or after the start time.
-    const isInProgress = potentiallyInProgress && !dateFns.isAfter(now, endsAtOnDay);
-    const hasOccuredToday = potentiallyInProgress && !isInProgress;
-    const currentIndex = isInProgress || hasOccuredToday ? dayIndex : dayIndex - 1; // If not in progress and hasn't occured today, current index is the previous index.
+    const isInProgressForDayIndex = potentiallyInProgress && !dateFns.isAfter(now, endsAtOnDay);
+    const hasOccuredToday = potentiallyInProgress && !isInProgressForDayIndex;
+    const currentIndex = isInProgressForDayIndex || hasOccuredToday ? dayIndex : dayIndex - 1; // If not in progress and hasn't occured today, current index is the previous index.
+    let isInProgress = false;
+    if (isInProgressForDayIndex) {
+      isInProgress = true;
+    } else if (currentIndex < dayIndex) {
+      const expectedStartForCurrentIndex = startsAtFactory(currentIndex);
+      if (!dateFns.isBefore(now, expectedStartForCurrentIndex)) {
+        // if now is after the expected start time, then check that the end time hasn't occured yet.
+        const expectedEndTime = dateFns.addMinutes(expectedStartForCurrentIndex, duration);
+        isInProgress = !dateFns.isAfter(now, expectedEndTime);
+      }
+    }
     const nextIndex = currentIndex + 1;
     const nextIndexInRange = checkIsInRange(nextIndex) ? nextIndex : undefined;
     const isComplete = currentIndex >= 0 && !nextIndexInRange && (!isInRange || hasOccuredToday);
@@ -5819,6 +5830,7 @@ function dateCellDayTimingInfoFactory(config) {
       nextIndex,
       hasOccuredToday,
       isInProgress,
+      isInProgressForDayIndex,
       isInRange,
       startsAtOnDay,
       endsAtOnDay,

package/index.esm.js

@@ -6410,9 +6410,22 @@ function dateCellDayTimingInfoFactory(config) {
     const endsAtOnDay = addMinutes(startsAtOnDay, duration);
     const potentiallyInProgress = !isAfter$1(startsAtOnDay, now); // is potentially in progress if the now is equal-to or after the start time.
 
-    const isInProgress = potentiallyInProgress && !isAfter$1(now, endsAtOnDay);
-    const hasOccuredToday = potentiallyInProgress && !isInProgress;
-    const currentIndex = isInProgress || hasOccuredToday ? dayIndex : dayIndex - 1; // If not in progress and hasn't occured today, current index is the previous index.
+    const isInProgressForDayIndex = potentiallyInProgress && !isAfter$1(now, endsAtOnDay);
+    const hasOccuredToday = potentiallyInProgress && !isInProgressForDayIndex;
+    const currentIndex = isInProgressForDayIndex || hasOccuredToday ? dayIndex : dayIndex - 1; // If not in progress and hasn't occured today, current index is the previous index.
+
+    let isInProgress = false;
+    if (isInProgressForDayIndex) {
+      isInProgress = true;
+    } else if (currentIndex < dayIndex) {
+      const expectedStartForCurrentIndex = startsAtFactory(currentIndex);
+      if (!isBefore(now, expectedStartForCurrentIndex)) {
+        // if now is after the expected start time, then check that the end time hasn't occured yet.
+
+        const expectedEndTime = addMinutes(expectedStartForCurrentIndex, duration);
+        isInProgress = !isAfter$1(now, expectedEndTime);
+      }
+    }
     const nextIndex = currentIndex + 1;
     const nextIndexInRange = checkIsInRange(nextIndex) ? nextIndex : undefined;
     const isComplete = currentIndex >= 0 && !nextIndexInRange && (!isInRange || hasOccuredToday);
@@ -6424,6 +6437,7 @@ function dateCellDayTimingInfoFactory(config) {
       nextIndex,
       hasOccuredToday,
       isInProgress,
+      isInProgressForDayIndex,
       isInRange,
       startsAtOnDay,
       endsAtOnDay,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/date",
-  "version": "10.1.5",
+  "version": "10.1.6",
   "exports": {
     ".": {
       "types": "./src/index.d.ts",

package/src/lib/date/date.cell.factory.d.ts

@@ -159,59 +159,65 @@ export interface DateCellDayTimingInfo {
     /**
      * Input date or calculated date if provided a dayIndex.
      */
-    date: Date;
+    readonly date: Date;
     /**
      * Index for the day for the input date.
      */
-    dayIndex: DateCellIndex;
+    readonly dayIndex: DateCellIndex;
     /**
      * Index for the previous index/current index depending on the TimingInfo's daily execution.
      *
      * If the index is currently in progress given the timing, this will return the dayIndex.
      */
-    currentIndex: DateCellIndex;
+    readonly currentIndex: DateCellIndex;
     /**
      * Index for the next execution. Does not check if it is in range.
      *
      * If the index is currently in progress given the timing, this will return the dayIndex + 1.
      */
-    nextIndex: DateCellIndex;
+    readonly nextIndex: DateCellIndex;
     /**
      * Index for the next execution, if in the range, otherwise undefined.
      *
      * If the index is currently in progress given the timing, this will return the dayIndex + 1.
      */
-    nextIndexInRange: Maybe<DateCellIndex>;
+    readonly nextIndexInRange: Maybe<DateCellIndex>;
     /**
      * Whether or not there are any inProgress or upcoming executions.
      *
      * True if nextIndexInRange is undefined and isInProgress is false.
      */
-    isComplete: boolean;
+    readonly isComplete: boolean;
     /**
      * Whether or not today's timing has already occured in it's entirety.
      */
-    hasOccuredToday: boolean;
+    readonly hasOccuredToday: boolean;
     /**
-     * Whether or not today's timing is currently in progress.
+     * Whether or not a timing is currently in progress.
+     *
+     * This can be true when isInProgressForDayIndex is false for cases where the timing starts at the previous day index and rolls on over into the next day.
+     */
+    readonly isInProgress: boolean;
+    /**
+     * Whether or not today's timing is currently in progress for the input dayIndex.
      */
-    isInProgress: boolean;
+    readonly isInProgressForDayIndex: boolean;
     /**
      * Whether or not the block is within the configured range.
      */
-    isInRange: boolean;
+    readonly isInRange: boolean;
     /**
      * Time the timing starts on the input day.
      */
-    startsAtOnDay: Date;
+    readonly startsAtOnDay: Date;
     /**
      * Time the timing ends on the input day.
      */
-    endsAtOnDay: Date;
+    readonly endsAtOnDay: Date;
     /**
      * "now" value used for considering current progress.
      */
-    now: Date;
+    readonly now: Date;
 }
 /**
  * Generates DateCellDayTimingInfo about the input date relative to the input timing and range limit.

package/src/lib/date/date.cell.schedule.d.ts

@@ -375,11 +375,11 @@ export interface DateCellScheduleDateCellTimingFilterConfig {
      */
     now?: Date;
     /**
-     * (Optional) filters in blocks that have not yet started. Can be combined with the other filters.
+     * (Optional) filters in blocks that have started. Can be combined with the other filters.
      */
     onlyBlocksThatHaveStarted?: boolean;
     /**
-     * (Optional) filters in blocks that have not yet ended. Can be combined with the other filters.
+     * (Optional) filters in blocks that have ended. Can be combined with the other filters.
      */
     onlyBlocksThatHaveEnded?: boolean;
     /**