Merge branch 'main' of https://github.com/rhinobase/raftyui

rhinobase · Oct 12, 2023 · d455136 · d455136
2 parents b211a05 + a0eee23
commit d455136
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/libs/ui/src/date-picker/date-picker.tsx b/libs/ui/src/date-picker/date-picker.tsx
@@ -46,6 +46,7 @@ export const DatePicker = (props: DatePicker) => {
         <Calendar
           {...props}
           mode="single"
+          showOutsideDays
           selected={selected}
           onSelect={setSelected}
           defaultMonth={selected}

diff --git a/libs/ui/src/date-picker/range-picker.tsx b/libs/ui/src/date-picker/range-picker.tsx
@@ -35,14 +35,15 @@ export const RangePicker = ({ className, ...props }: RangePicker) => {
     props.selected,
   );
 
-  const display = [];
+  let display = "";
   if (selected?.from)
-    display.push(
-      props.formatters?.formatDay?.(selected.from) ??
-        format(selected.from, "longDate"),
-    );
+    display +=
+      String(
+        props.formatters?.formatDay?.(selected.from) ??
+          format(selected.from, "longDate"),
+      ) + " - ";
   if (selected?.to)
-    display.push(
+    display += String(
       props.formatters?.formatDay?.(selected.to) ??
         format(selected.to, "longDate"),
     );
@@ -58,7 +59,7 @@ export const RangePicker = ({ className, ...props }: RangePicker) => {
         )}
         leftIcon={<CalendarIcon className="h-4 w-4" />}
       >
-        {display.length !== 0 ? display.join(" - ") : "Pick a range"}
+        {display.length !== 0 ? display : "Pick a range"}
         <div className="flex-1" />
         {selected && (
           <div