X2-6916 Datepicker for same day shows text in white (v2.1.15) (#264)

* X2-6916 Datepicker for same day shows text in white (v2.1.15) * X2-7088: Revert changes which are breaking selenium * Revert changes for isSameDay * X2-6916: Fix selenium failures * Update src/components/DatePicker/DatePicker.jsx * lint fix * added comment --------- Co-authored-by: Tanushree Chakravarty <[email protected]> Co-authored-by: Rushi Vishavadia <[email protected]>
xola · Sep 19, 2023 · 7cb0dcf · 7cb0dcf
1 parent 207320c
commit 7cb0dcf
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/components/DatePicker/DatePicker.jsx b/src/components/DatePicker/DatePicker.jsx
@@ -141,6 +141,8 @@ export const DatePicker = ({
 
     // Comparing `from` and `to` dates hides a weird CSS style when you select the same date twice in a date range.
     const useDateRangeStyle = isRangeVariant && value.from?.getTime() !== value.to?.getTime();
+    // Return the same value if it is already dayjs object or has range variant otherwise format it to dayJs object
+    const selectedDays = dayjs.isDayjs(value) || isRangeVariant ? value : dayjs(value).toDate();
 
     return (
         <>
@@ -189,7 +191,7 @@ export const DatePicker = ({
                         modifiers.waitlist ? "has-custom-content" : null,
                     )}
                     todayButton={variant === "single" ? "Today" : undefined}
-                    selectedDays={value}
+                    selectedDays={selectedDays}
                     month={currentMonth}
                     modifiers={{ ...modifiers, ...rangeModifier }}
                     numberOfMonths={isRangeVariant ? 2 : 1}