Fix: date range selector (#6625)

* fix: Handled workspace switcher closing on click

* fix: removed action btns from date range selector

* fix: updated calendar component

web/core/components/core/filters/date-filter-modal.tsx

@@ -1,17 +1,14 @@
 "use client";
 import { Fragment } from "react";
-
-import { DayPicker, getDefaultClassNames } from "react-day-picker";
 import { Controller, useForm } from "react-hook-form";
 
 import { X } from "lucide-react";
 import { Dialog, Transition } from "@headlessui/react";
 
-import { Button } from "@plane/ui";
+import { Button, Calendar } from "@plane/ui";
 
 import { renderFormattedPayloadDate, renderFormattedDate, getDate } from "@/helpers/date-time.helper";
 import { DateFilterSelect } from "./date-filter-select";
-
 type Props = {
   title: string;
   handleClose: () => void;
@@ -31,8 +28,6 @@ const defaultValues: TFormValues = {
   date2: new Date(new Date().getFullYear(), new Date().getMonth() + 1, new Date().getDate()),
 };
 
-const defaultClassNames = getDefaultClassNames();
-
 export const DateFilterModal: React.FC<Props> = ({ title, handleClose, isOpen, onSelect }) => {
   const { handleSubmit, watch, control } = useForm<TFormValues>({
     defaultValues,
@@ -98,9 +93,9 @@ export const DateFilterModal: React.FC<Props> = ({ title, handleClose, isOpen, o
                         const dateValue = getDate(value);
                         const date2Value = getDate(watch("date2"));
                         return (
-                          <DayPicker
+                          <Calendar
                             classNames={{
-                              root: `${defaultClassNames.root} border border-custom-border-200 p-3 rounded-md`,
+                              root: ` border border-custom-border-200 p-3 rounded-md`,
                             }}
                             captionLayout="dropdown"
                             selected={dateValue}
@@ -123,9 +118,9 @@ export const DateFilterModal: React.FC<Props> = ({ title, handleClose, isOpen, o
                           const dateValue = getDate(value);
                           const date1Value = getDate(watch("date1"));
                           return (
-                            <DayPicker
+                            <Calendar
                               classNames={{
-                                root: `${defaultClassNames.root} border border-custom-border-200 p-3 rounded-md`,
+                                root: ` border border-custom-border-200 p-3 rounded-md`,
                               }}
                               captionLayout="dropdown"
                               selected={dateValue}

web/core/components/dropdowns/date-range.tsx

@@ -2,12 +2,12 @@
 
 import React, { useEffect, useRef, useState } from "react";
 import { Placement } from "@popperjs/core";
-import { DateRange, DayPicker, Matcher, getDefaultClassNames } from "react-day-picker";
+import { DateRange, Matcher } from "react-day-picker";
 import { usePopper } from "react-popper";
 import { ArrowRight, CalendarCheck2, CalendarDays } from "lucide-react";
 import { Combobox } from "@headlessui/react";
 // ui
-import { Button, ComboDropDown } from "@plane/ui";
+import { ComboDropDown, Calendar } from "@plane/ui";
 // helpers
 import { cn } from "@/helpers/common.helper";
 import { renderFormattedDate } from "@/helpers/date-time.helper";
@@ -52,18 +52,13 @@ type Props = {
   renderPlaceholder?: boolean;
 };
 
-const defaultClassNames = getDefaultClassNames();
-
 export const DateRangeDropdown: React.FC<Props> = (props) => {
   const {
-    applyButtonText = "Apply changes",
-    bothRequired = true,
     buttonClassName,
     buttonContainerClassName,
     buttonFromDateClassName,
     buttonToDateClassName,
     buttonVariant,
-    cancelButtonText = "Cancel",
     className,
     disabled = false,
     hideIcon = {
@@ -78,7 +73,6 @@ export const DateRangeDropdown: React.FC<Props> = (props) => {
       to: "Add date",
     },
     placement,
-    required = false,
     showTooltip = false,
     tabIndex,
     value,
@@ -205,53 +199,23 @@ export const DateRangeDropdown: React.FC<Props> = (props) => {
             style={styles.popper}
             {...attributes.popper}
           >
-            <DayPicker
+            <Calendar
               captionLayout="dropdown"
-              classNames={{ root: `${defaultClassNames.root} p-3 rounded-md` }}
+              classNames={{ root: `p-3 rounded-md` }}
               selected={dateRange}
               onSelect={(val) => {
-                // if both the dates are not required, immediately call onSelect
-                if (!bothRequired) onSelect(val);
+                onSelect(val);
                 setDateRange({
                   from: val?.from ?? undefined,
                   to: val?.to ?? undefined,
                 });
+                val?.from && val?.to && handleClose();
               }}
               mode="range"
               disabled={disabledDays}
               showOutsideDays
-              autoFocus
               fixedWeeks
-              footer={
-                bothRequired && (
-                  <div className="grid grid-cols-2 items-center gap-3.5 pt-6 relative">
-                    <div className="absolute left-0 top-1 h-[0.5px] w-full border-t-[0.5px] border-custom-border-300" />
-                    <Button
-                      variant="neutral-primary"
-                      onClick={() => {
-                        setDateRange({
-                          from: undefined,
-                          to: undefined,
-                        });
-                        handleClose();
-                      }}
-                    >
-                      {cancelButtonText}
-                    </Button>
-                    <Button
-                      onClick={() => {
-                        onSelect(dateRange);
-                        handleClose();
-                      }}
-                      // if required, both the dates should be selected
-                      // if not required, either both or none of the dates should be selected
-                      disabled={required ? !(dateRange.from && dateRange.to) : !!dateRange.from !== !!dateRange.to}
-                    >
-                      {applyButtonText}
-                    </Button>
-                  </div>
-                )
-              }
+              initialFocus
             />
           </div>
         </Combobox.Options>

web/core/components/dropdowns/date.tsx

@@ -1,11 +1,11 @@
 import React, { useRef, useState } from "react";
-import { DayPicker, Matcher, getDefaultClassNames } from "react-day-picker";
+import { Matcher } from "react-day-picker";
 import { createPortal } from "react-dom";
 import { usePopper } from "react-popper";
 import { CalendarDays, X } from "lucide-react";
 import { Combobox } from "@headlessui/react";
 // ui
-import { ComboDropDown } from "@plane/ui";
+import { ComboDropDown, Calendar } from "@plane/ui";
 // helpers
 import { cn } from "@/helpers/common.helper";
 import { renderFormattedDate, getDate } from "@/helpers/date-time.helper";
@@ -33,8 +33,6 @@ type Props = TDropdownProps & {
   renderByDefault?: boolean;
 };
 
-const defaultClassNames = getDefaultClassNames();
-
 export const DateDropdown: React.FC<Props> = (props) => {
   const {
     buttonClassName = "",
@@ -175,16 +173,16 @@ export const DateDropdown: React.FC<Props> = (props) => {
               style={styles.popper}
               {...attributes.popper}
             >
-              <DayPicker
+              <Calendar
                 captionLayout="dropdown"
-                classNames={{ root: `${defaultClassNames.root} p-3 rounded-md` }}
+                classNames={{ root: `p-3 rounded-md` }}
                 selected={getDate(value)}
                 defaultMonth={getDate(value)}
                 onSelect={(date) => {
                   dropdownOnChange(date ?? null);
                 }}
                 showOutsideDays
-                autoFocus
+                initialFocus
                 disabled={disabledDays}
                 mode="single"
                 fixedWeeks

web/core/components/inbox/modals/snooze-issue-modal.tsx

@@ -1,11 +1,10 @@
 "use client";
 
 import { FC, Fragment, useState } from "react";
-import { DayPicker, getDefaultClassNames } from "react-day-picker";
 import { Dialog, Transition } from "@headlessui/react";
 // ui
 import { useTranslation } from "@plane/i18n";
-import { Button } from "@plane/ui";
+import { Button, Calendar } from "@plane/ui";
 
 export type InboxIssueSnoozeModalProps = {
   isOpen: boolean;
@@ -21,8 +20,6 @@ export const InboxIssueSnoozeModal: FC<InboxIssueSnoozeModalProps> = (props) =>
   //hooks
   const { t } = useTranslation();
 
-  const defaultClassNames = getDefaultClassNames();
-
   return (
     <Transition.Root show={isOpen} as={Fragment}>
       <Dialog as="div" className="relative z-20" onClose={handleClose}>
@@ -50,9 +47,9 @@ export const InboxIssueSnoozeModal: FC<InboxIssueSnoozeModalProps> = (props) =>
             >
               <Dialog.Panel className="relative flex transform rounded-lg bg-custom-background-100 px-5 py-8 text-left shadow-custom-shadow-md transition-all sm:my-8 sm:w-full sm:max-w-2xl sm:p-6">
                 <div className="flex h-full w-full flex-col gap-y-1">
-                  <DayPicker
+                  <Calendar
                     captionLayout="dropdown"
-                    classNames={{root: `${defaultClassNames.root} rounded-md border border-custom-border-200 p-3`}}
+                    classNames={{ root: `rounded-md border border-custom-border-200 p-3` }}
                     selected={date ? new Date(date) : undefined}
                     defaultMonth={date ? new Date(date) : undefined}
                     onSelect={(date) => {