From 5683d94d0c6f9d4c48e63afbf6c859d901136a24 Mon Sep 17 00:00:00 2001 From: gakshita Date: Tue, 11 Feb 2025 16:09:27 +0530 Subject: [PATCH 1/3] fix: Handled workspace switcher closing on click --- .../workspace/sidebar/dropdown-item.tsx | 5 +++- .../components/workspace/sidebar/dropdown.tsx | 25 +++++-------------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/web/core/components/workspace/sidebar/dropdown-item.tsx b/web/core/components/workspace/sidebar/dropdown-item.tsx index 183a8fdb396..7638b657276 100644 --- a/web/core/components/workspace/sidebar/dropdown-item.tsx +++ b/web/core/components/workspace/sidebar/dropdown-item.tsx @@ -19,9 +19,10 @@ type TProps = { activeWorkspace: IWorkspace | null; handleItemClick: () => void; handleWorkspaceNavigation: (workspace: IWorkspace) => void; + handleClose: () => void; }; const SidebarDropdownItem = observer((props: TProps) => { - const { workspace, activeWorkspace, handleItemClick, handleWorkspaceNavigation } = props; + const { workspace, activeWorkspace, handleItemClick, handleWorkspaceNavigation, handleClose } = props; // router const { workspaceSlug } = useParams(); // hooks @@ -89,6 +90,7 @@ const SidebarDropdownItem = observer((props: TProps) => {
@@ -96,6 +98,7 @@ const SidebarDropdownItem = observer((props: TProps) => { diff --git a/web/core/components/workspace/sidebar/dropdown.tsx b/web/core/components/workspace/sidebar/dropdown.tsx index 8d131594840..ac9acf42e5b 100644 --- a/web/core/components/workspace/sidebar/dropdown.tsx +++ b/web/core/components/workspace/sidebar/dropdown.tsx @@ -46,20 +46,10 @@ export const SidebarDropdown = observer(() => { // popper-js init const { styles, attributes } = usePopper(referenceElement, popperElement, { placement: "right", - modifiers: [ - { - name: "preventOverflow", - options: { - padding: 12, - }, - }, - ], + modifiers: [{ name: "preventOverflow", options: { padding: 12 } }], }); - const handleWorkspaceNavigation = (workspace: IWorkspace) => - updateUserProfile({ - last_workspace_id: workspace?.id, - }); + const handleWorkspaceNavigation = (workspace: IWorkspace) => updateUserProfile({ last_workspace_id: workspace?.id }); const handleSignOut = async () => { await signOut().catch(() => @@ -86,14 +76,12 @@ export const SidebarDropdown = observer(() => { "flex-grow-0 justify-center": sidebarCollapsed, })} > - {({ open }) => ( + {({ open, close }) => ( <>
@@ -108,9 +96,7 @@ export const SidebarDropdown = observer(() => {
From e74b10e5d16b1b5d450cd560dbb2970fdf2a85cc Mon Sep 17 00:00:00 2001 From: gakshita Date: Tue, 18 Feb 2025 12:09:54 +0530 Subject: [PATCH 2/3] fix: removed action btns from date range selector --- web/core/components/dropdowns/date-range.tsx | 33 +------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/web/core/components/dropdowns/date-range.tsx b/web/core/components/dropdowns/date-range.tsx index 926e995372b..b807306b6a5 100644 --- a/web/core/components/dropdowns/date-range.tsx +++ b/web/core/components/dropdowns/date-range.tsx @@ -210,8 +210,7 @@ export const DateRangeDropdown: React.FC = (props) => { classNames={{ root: `${defaultClassNames.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, @@ -222,36 +221,6 @@ export const DateRangeDropdown: React.FC = (props) => { showOutsideDays autoFocus fixedWeeks - footer={ - bothRequired && ( -
-
- - -
- ) - } />
From 71afd9c7ae978d6b8c2823f35988aa48d1a2c24d Mon Sep 17 00:00:00 2001 From: gakshita Date: Wed, 19 Feb 2025 13:18:57 +0530 Subject: [PATCH 3/3] fix: updated calendar component --- packages/ui/src/calendar.tsx | 57 +++++++++++++++++++ packages/ui/src/index.ts | 1 + .../core/filters/date-filter-modal.tsx | 15 ++--- web/core/components/dropdowns/date-range.tsx | 17 ++---- web/core/components/dropdowns/date.tsx | 12 ++-- .../inbox/modals/snooze-issue-modal.tsx | 9 +-- web/package.json | 2 +- yarn.lock | 53 ++++++++++------- 8 files changed, 110 insertions(+), 56 deletions(-) create mode 100644 packages/ui/src/calendar.tsx diff --git a/packages/ui/src/calendar.tsx b/packages/ui/src/calendar.tsx new file mode 100644 index 00000000000..bb5b5177439 --- /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; + +function Calendar({ className, classNames, showOutsideDays = true, ...props }: CalendarProps) { + return ( + .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 }) => , + IconRight: ({ className, ...props }) => , + }} + {...props} + /> + ); +} +Calendar.displayName = "Calendar"; + +export { Calendar }; diff --git a/packages/ui/src/index.ts b/packages/ui/src/index.ts index f583178ddd0..19edba780c8 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.tsx index a8363420523..a1c76da4b4c 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 = ({ title, handleClose, isOpen, onSelect }) => { const { handleSubmit, watch, control } = useForm({ defaultValues, @@ -98,9 +93,9 @@ export const DateFilterModal: React.FC = ({ title, handleClose, isOpen, o const dateValue = getDate(value); const date2Value = getDate(watch("date2")); return ( - = ({ title, handleClose, isOpen, o const dateValue = getDate(value); const date1Value = getDate(watch("date1")); return ( - = (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) => { to: "Add date", }, placement, - required = false, showTooltip = false, tabIndex, value, @@ -205,9 +199,9 @@ export const DateRangeDropdown: React.FC = (props) => { style={styles.popper} {...attributes.popper} > - { onSelect(val); @@ -215,12 +209,13 @@ export const DateRangeDropdown: React.FC = (props) => { from: val?.from ?? undefined, to: val?.to ?? undefined, }); + val?.from && val?.to && handleClose(); }} mode="range" disabled={disabledDays} showOutsideDays - autoFocus fixedWeeks + initialFocus />
diff --git a/web/core/components/dropdowns/date.tsx b/web/core/components/dropdowns/date.tsx index e38f175b5fe..c19d0fe85f9 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"; // 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) => { const { buttonClassName = "", @@ -175,16 +173,16 @@ export const DateDropdown: React.FC = (props) => { style={styles.popper} {...attributes.popper} > - { dropdownOnChange(date ?? null); }} showOutsideDays - autoFocus + initialFocus disabled={disabledDays} mode="single" fixedWeeks diff --git a/web/core/components/inbox/modals/snooze-issue-modal.tsx b/web/core/components/inbox/modals/snooze-issue-modal.tsx index 1d64ebef3e2..6d53a023409 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"; // 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 = (props) => //hooks const { t } = useTranslation(); - const defaultClassNames = getDefaultClassNames(); - return ( @@ -50,9 +47,9 @@ export const InboxIssueSnoozeModal: FC = (props) => >
- { diff --git a/web/package.json b/web/package.json index 0dfe18078e0..53af6b4b875 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.lock index 45d9a5d68a6..8ea52b5323a 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" +react-day-picker@8.10.1: + 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==