π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
Fix: date range selector (#6625)
Akshita Goyalf9d154dd82f8
diff --git a/packages/ui/src/calendar.tsx b/packages/ui/src/calendar.tsxnew file mode 100644index 0000000000..bb5b517743--- /dev/null+++ b/packages/ui/src/calendar.tsx@@ -0,0 +1,57 @@+"use client";++import { ChevronLeft, ChevronRight } from "lucide-react";+import * as React from "react";+import { DayPicker } from "react-day-picker";++import { cn } from "../helpers";++export type CalendarProps = React.ComponentProps<typeof DayPicker>;++function Calendar({ className, classNames, showOutsideDays = true, ...props }: CalendarProps) {+ return (+ <DayPicker+ showOutsideDays={showOutsideDays}+ className={cn("p-3", className)}+ classNames={{+ months: "flex flex-col sm:flex-row space-y-4 sm:space-x-4 sm:space-y-0",+ month: "space-y-4",+ caption: "flex justify-center pt-1 relative items-center",+ caption_label: "text-sm font-medium",+ nav: "space-x-1 flex items-center",+ nav_button: cn("h-10 bg-transparent p-0 opacity-50 hover:opacity-100"),+ nav_button_previous: "absolute left-1",+ nav_button_next: "absolute right-1",+ table: "w-full border-collapse space-y-1",+ head_row: "flex w-full items-center",+ head_cell: "rounded-md w-10 font-normal text-[10px] text-center m-auto font-semibold uppercase",+ row: "flex w-full mt-2",+ cell: cn(+ "relative p-0 text-center text-sm focus-within:relative focus-within:z-20 [&:has([aria-selected])]:bg-custom-primary-100/50 [&:has([aria-selected].day-range-end)]:rounded-r-full",+ props.mode === "range"+ ? "[&:has(>.day-range-end)]:rounded-r-full [&:has(>.day-range-start)]:rounded-l-full first:[&:has([aria-selected])]:rounded-l-full last:[&:has([aria-selected])]:rounded-r-full"+ : "[&:has([aria-selected])]:rounded-full [&:has([aria-selected])]:bg-custom-primary-100 [&:has([aria-selected])]:text-white"+ ),+ day: cn("h-10 w-10 p-0 font-normal aria-selected:opacity-100 rounded-full hover:bg-custom-primary-100/60"),+ day_range_start: "day-range-start bg-custom-primary-100 text-white",+ day_range_end: "day-range-end bg-custom-primary-100 text-white",+ day_selected: "",+ day_today:+ "relative after:content-[''] after:absolute after:m-auto after:left-1/3 after:bottom-[6px] after:w-[6px] after:h-[6px] after:bg-custom-primary-100/50 after:rounded-full after:translate-x-1/2 after:translate-y-1/2",+ day_outside: "day-outside",+ day_disabled: "opacity-50 hover:!bg-transparent",+ day_range_middle: "text-black",+ day_hidden: "invisible",+ ...classNames,+ }}+ components={{+ IconLeft: ({ className, ...props }) => <ChevronLeft className={cn("h-4 w-4", className)} {...props} />,+ IconRight: ({ className, ...props }) => <ChevronRight className={cn("h-4 w-4", className)} {...props} />,+ }}+ {...props}+ />+ );+}+Calendar.displayName = "Calendar";++export { Calendar };diff --git a/packages/ui/src/index.ts b/packages/ui/src/index.tsindex f583178ddd..19edba780c 100644--- a/packages/ui/src/index.ts+++ b/packages/ui/src/index.ts@@ -30,3 +30,4 @@ export * from "./content-wrapper";export * from "./card";export * from "./tag";export * from "./tabs";+export * from "./calendar";diff --git a/web/core/components/core/filters/date-filter-modal.tsx b/web/core/components/core/filters/date-filter-modal.tsxindex a836342052..a1c76da4b4 100644--- a/web/core/components/core/filters/date-filter-modal.tsx+++ b/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, oconst dateValue = getDate(value);const date2Value = getDate(watch("date2"));return (- <DayPicker+ <CalendarclassNames={{- 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, oconst dateValue = getDate(value);const date1Value = getDate(watch("date1"));return (- <DayPicker+ <CalendarclassNames={{- 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}diff --git a/web/core/components/dropdowns/date-range.tsx b/web/core/components/dropdowns/date-range.tsxindex 926e995372..bcca9c9d59 100644--- a/web/core/components/dropdowns/date-range.tsx+++ b/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";// helpersimport { 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+ <CalendarcaptionLayout="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- autoFocusfixedWeeks- 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>diff --git a/web/core/components/dropdowns/date.tsx b/web/core/components/dropdowns/date.tsxindex e38f175b5f..c19d0fe85f 100644--- a/web/core/components/dropdowns/date.tsx+++ b/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";// helpersimport { 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+ <CalendarcaptionLayout="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+ initialFocusdisabled={disabledDays}mode="single"fixedWeeksdiff --git a/web/core/components/inbox/modals/snooze-issue-modal.tsx b/web/core/components/inbox/modals/snooze-issue-modal.tsxindex 1d64ebef3e..6d53a02340 100644--- a/web/core/components/inbox/modals/snooze-issue-modal.tsx+++ b/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";// uiimport { 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) =>//hooksconst { 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+ <CalendarcaptionLayout="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) => {diff --git a/web/package.json b/web/package.jsonindex 0dfe18078e..53af6b4b87 100644--- a/web/package.json+++ b/web/package.json@@ -56,7 +56,7 @@"posthog-js": "^1.131.3","react": "^18.3.1","react-color": "^2.19.3",- "react-day-picker": "^9.5.0",+ "react-day-picker": "8.10.1","react-dom": "^18.3.1","react-dropzone": "^14.2.3","react-hook-form": "7.51.5",diff --git a/yarn.lock b/yarn.lockindex 45d9a5d68a..8ea52b5323 100644--- a/yarn.lock+++ b/yarn.lock@@ -988,11 +988,6 @@enabled "2.0.x"kuler "^2.0.0"-"@date-fns/tz@^1.2.0":- version "1.2.0"- resolved "https://registry.npmjs.org/@date-fns/tz/-/tz-1.2.0.tgz#81cb3211693830babaf3b96aff51607e143030a6"- integrity sha512-LBrd7MiJZ9McsOgxqWX7AaxrDjcFVjWH/tIKJd7pnR7McaslGYOP1QmmiBXdJH/H/yLCT+rcQ7FaPBUxRGUtrg==-"@emotion/babel-plugin@^11.13.5":version "11.13.5"resolved "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.13.5.tgz#eab8d65dbded74e0ecfd28dc218e75607c4e7bc0"@@ -5982,11 +5977,6 @@ data-view-byte-offset@^1.0.1:es-errors "^1.3.0"is-data-view "^1.0.1"-date-fns-jalali@^4.1.0-0:- version "4.1.0-0"- resolved "https://registry.npmjs.org/date-fns-jalali/-/date-fns-jalali-4.1.0-0.tgz#9c7fb286004fab267a300d3e9f1ada9f10b4b6b0"- integrity sha512-hTIP/z+t+qKwBDcmmsnmjWTduxCg+5KfdqWQvb2X/8C9+knYY6epN/pfxdDuyVlSVeFz0sM5eEfwIUQ70U4ckg==-date-fns@^4.1.0:version "4.1.0"resolved "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz#64b3d83fff5aa80438f5b1a633c2e83b8a1c2d14"@@ -10381,14 +10371,10 @@ react-confetti@^6.1.0:dependencies:tween-functions "^1.2.0"-react-day-picker@^9.5.0:- version "9.5.1"- resolved "https://registry.npmjs.org/react-day-picker/-/react-day-picker-9.5.1.tgz#ec40acdcc3ffbf7c0b9bfea8b6f97924249ea974"- integrity sha512-PxuK8inYLlYgM2zZUVBPsaBM5jI40suPeG+naKyx7kpyF032RRlEAUEjkpW9/poTASh/vyWAOVqjGuGw+47isw==- dependencies:- "@date-fns/tz" "^1.2.0"- date-fns "^4.1.0"- date-fns-jalali "^4.1.0-0"+ version "8.10.1"+ resolved "https://registry.yarnpkg.com/react-day-picker/-/react-day-picker-8.10.1.tgz#4762ec298865919b93ec09ba69621580835b8e80"+ integrity sha512-TMx7fNbhLk15eqcMt+7Z7S2KF7mfTId/XJDjKE8f+IUcFn0l08/kI4FiYTL/0yuOLmEcbR4Fwe3GJf/NiiMnPA==react-docgen-typescript@^2.2.2:version "2.2.2"@@ -11405,7 +11391,16 @@ streamx@^2.15.0, streamx@^2.21.0:optionalDependencies:bare-events "^2.2.0"-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:+"string-width-cjs@npm:string-width@^4.2.0":+ version "4.2.3"+ resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"+ integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==+ dependencies:+ emoji-regex "^8.0.0"+ is-fullwidth-code-point "^3.0.0"+ strip-ansi "^6.0.1"++string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:version "4.2.3"resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==@@ -11498,7 +11493,14 @@ string_decoder@^1.1.1, string_decoder@^1.3.0:dependencies:safe-buffer "~5.2.0"-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":+ version "6.0.1"+ resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"+ integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==+ dependencies:+ ansi-regex "^5.0.1"++strip-ansi@^6.0.0, strip-ansi@^6.0.1:version "6.0.1"resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==@@ -12726,7 +12728,16 @@ word-wrap@^1.2.5:resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":+ version "7.0.0"+ resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"+ integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==+ dependencies:+ ansi-styles "^4.0.0"+ string-width "^4.1.0"+ strip-ansi "^6.0.0"++wrap-ansi@^7.0.0:version "7.0.0"resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==