Merge branch 'master' into X2-10202

xola · Aug 27, 2024 · c30a029 · c30a029
2 parents 5a9599f + 82b7a88
commit c30a029
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@xola/ui-kit",
-    "version": "2.3.10",
+    "version": "2.3.11",
     "description": "Xola UI Kit",
     "license": "MIT",
     "repository": {

diff --git a/src/components/DatePicker/DatePicker.jsx b/src/components/DatePicker/DatePicker.jsx
@@ -145,16 +145,17 @@ export const DatePicker = ({
                 const to = toDate(now(day, timezoneName).endOf("day"), false);
 
                 onChange({ from, to }, options, event);
-            } else if (DateUtils.isDayBefore(value.from, toDate(now(day, timezoneName)))) {
+            } else if (value.from && DateUtils.isDayBefore(value.from, toDate(now(day, timezoneName)))) {
                 // this works if the user first clicked on the date that will go to "from", and the second click to "to"
                 onChange(
                     DateUtils.addDayToRange(toDate(now(day, timezoneName).endOf("day"), false), value),
                     options,
                     event,
                 );
             } else if (
-                DateUtils.isDayAfter(value.from, toDate(now(day, timezoneName))) ||
-                DateUtils.isSameDay(value.from, toDate(now(day, timezoneName)))
+                value.from &&
+                (DateUtils.isDayAfter(value.from, toDate(now(day, timezoneName))) ||
+                    DateUtils.isSameDay(value.from, toDate(now(day, timezoneName))))
             ) {
                 // this works if the user first clicked on the date that will go to "to", and the second click to "from"
                 // also this works when the user has selected one date
@@ -166,6 +167,13 @@ export const DatePicker = ({
                     options,
                     event,
                 );
+            } else {
+                // Fallback when value.from is null
+                onChange(
+                    DateUtils.addDayToRange(toDate(now(day, timezoneName).endOf("day"), false), value),
+                    options,
+                    event,
+                );
             }
         } else {
             onChange(toDate(now(day, timezoneName)), options, event);