fix: normalize startdate and enddate timestamps in rangepicker (#1025)

* fix: fix startdate and enddate timestamps in rangepicker

* fix: abstract normalizer

Author: ayush-raj-eightfold

src/components/DateTimePicker/Internal/OcRangePicker.tsx

@@ -37,6 +37,7 @@ import {
   getInputSize,
   elementsContains,
 } from './Utils/uiUtil';
+import { normalizeRangeTimes, normalizeSingleTime } from './Utils/timeUtil';
 import type { ContextOperationRefProps } from './PartialContext';
 import PartialContext from './PartialContext';
 import {
@@ -409,6 +410,13 @@ function InnerRangePicker<DateType>(props: OcRangePickerProps<DateType>) {
       }
     }
 
+    // Normalize times when showTime is false
+    if (!showTime && picker !== 'time') {
+      values = normalizeRangeTimes(generateConfig, values);
+      startValue = getValue(values, 0);
+      endValue = getValue(values, 1);
+    }
+
     setSelectedValue(values);
 
     const startStr: string = values?.[0]
@@ -452,7 +460,6 @@ function InnerRangePicker<DateType>(props: OcRangePickerProps<DateType>) {
 
     const canTrigger: boolean =
       values === null || (canStartValueTrigger && canEndValueTrigger);
-
     if (canTrigger) {
       // Trigger onChange only when value is validated.
       setInnerValue(values);
@@ -503,8 +510,19 @@ function InnerRangePicker<DateType>(props: OcRangePickerProps<DateType>) {
       index === 0 ? disabledStartDate : disabledEndDate;
 
     if (inputDate && !disabledFunc(inputDate)) {
-      setSelectedValue(updateValues(selectedValue, inputDate, index));
-      setViewDate(inputDate, index);
+      let normalizedInputDate: DateType = inputDate;
+
+      // Normalize times when showTime is false
+      if (!showTime && picker !== 'time') {
+        normalizedInputDate = normalizeSingleTime(
+          generateConfig,
+          inputDate,
+          index === 0 // isStartDate
+        );
+      }
+
+      setSelectedValue(updateValues(selectedValue, normalizedInputDate, index));
+      setViewDate(normalizedInputDate, index);
     }
   };
 
@@ -1170,7 +1188,7 @@ function InnerRangePicker<DateType>(props: OcRangePickerProps<DateType>) {
     date: DateType,
     type: 'key' | 'mouse' | 'submit'
   ) => {
-    const values: [DateType, DateType] = updateValues(
+    let values: [DateType, DateType] = updateValues(
       selectedValue,
       date,
       mergedActivePickerIndex
@@ -1197,6 +1215,11 @@ function InnerRangePicker<DateType>(props: OcRangePickerProps<DateType>) {
         triggerOpen(false, mergedActivePickerIndex, 'confirm');
       }
     } else {
+      // Normalize times when showTime is false before setting selected value
+      if (!showTime && picker !== 'time') {
+        values = normalizeRangeTimes(generateConfig, values);
+      }
+
       setSelectedValue(values);
     }
   };

src/components/DateTimePicker/Internal/Tests/range.test.tsx

@@ -2024,4 +2024,16 @@ describe('Picker.Range', () => {
     ).toBe('0px');
     mock.mockRestore();
   });
+
+  it('should select the start time stamp at 00:00:00 and end time stamp at 23:59:59 when the time is not selected', () => {
+    const onChange = jest.fn();
+    const wrapper = mount(<DayjsRangePicker onChange={onChange} />);
+
+    wrapper.openPicker();
+    wrapper.selectCell(2);
+    wrapper.selectCell(5);
+
+    expect(onChange.mock.calls[0][0][0].format('HH:mm:ss')).toBe('00:00:00');
+    expect(onChange.mock.calls[0][0][1].format('HH:mm:ss')).toBe('23:59:59');
+  });
 });

src/components/DateTimePicker/Internal/Utils/timeUtil.ts

@@ -1,5 +1,6 @@
 import type { NullableDateType } from '../OcPicker.types';
 import type { GenerateConfig } from '../Generate';
+import type { RangeValue } from '../OcPicker.types';
 
 export function setTime<DateType>(
   generateConfig: GenerateConfig<DateType>,
@@ -72,3 +73,52 @@ export function getLastDay<DateType>(
   const monthShow: string = month < 10 ? `0${month}` : `${month}`;
   return `${year}-${monthShow}-${lastDay}`;
 }
+
+export function normalizeRangeTimes<DateType>(
+  generateConfig: GenerateConfig<DateType>,
+  values: RangeValue<DateType>
+): RangeValue<DateType> {
+  if (!values) {
+    return values;
+  }
+
+  let normalizedValues: [DateType, DateType] = values;
+
+  // Set start date to beginning of day (00:00:00)
+  if (normalizedValues?.[0]) {
+    normalizedValues[0] = setTime(
+      generateConfig,
+      normalizedValues[0],
+      0, // hour
+      0, // minute
+      0 // second
+    );
+  }
+
+  // Set end date to end of day (23:59:59)
+  if (normalizedValues?.[1]) {
+    normalizedValues[1] = setTime(
+      generateConfig,
+      normalizedValues[1],
+      23, // hour
+      59, // minute
+      59 // second
+    );
+  }
+
+  return normalizedValues;
+}
+
+export function normalizeSingleTime<DateType>(
+  generateConfig: GenerateConfig<DateType>,
+  date: DateType,
+  isStartDate: boolean
+): DateType {
+  if (isStartDate) {
+    // Set to beginning of day (00:00:00)
+    return setTime(generateConfig, date, 0, 0, 0);
+  } else {
+    // Set to end of day (23:59:59)
+    return setTime(generateConfig, date, 23, 59, 59);
+  }
+}