fix: Issue properties dropdown overflow issue for date and labels (#2604)

This commit is contained in:
guru_sainath 2023-11-02 15:59:43 +05:30 committed by GitHub
parent 325fb4a377
commit f6b95b8d31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 205 additions and 170 deletions

View File

@ -1,9 +1,8 @@
import React, { useState } from "react"; import React, { useState } from "react";
import { observer } from "mobx-react-lite"; import { observer } from "mobx-react-lite";
import { usePopper } from "react-popper";
// mobx store // mobx store
import { useMobxStore } from "lib/mobx/store-provider"; import { useMobxStore } from "lib/mobx/store-provider";
// popper js
import { usePopper } from "react-popper";
// ui // ui
import { Combobox } from "@headlessui/react"; import { Combobox } from "@headlessui/react";
// icons // icons

View File

@ -1,5 +1,5 @@
import React from "react"; import React, { Fragment, useState } from "react";
import { usePopper } from "react-popper";
import { Popover, Transition } from "@headlessui/react"; import { Popover, Transition } from "@headlessui/react";
import { CalendarDays, X } from "lucide-react"; import { CalendarDays, X } from "lucide-react";
// react-datepicker // react-datepicker
@ -15,12 +15,23 @@ type Props = {
value: string | null; value: string | null;
}; };
export const IssueDateSelect: React.FC<Props> = ({ label, maxDate, minDate, onChange, value }) => ( export const IssueDateSelect: React.FC<Props> = ({ label, maxDate, minDate, onChange, value }) => {
const [referenceElement, setReferenceElement] = React.useState<HTMLDivElement | null>(null);
const [popperElement, setPopperElement] = React.useState<HTMLDivElement | null>(null);
const { styles, attributes } = usePopper(referenceElement, popperElement, {
placement: "bottom-start",
});
return (
<Popover className="relative flex items-center justify-center rounded-lg"> <Popover className="relative flex items-center justify-center rounded-lg">
{({ close }) => ( {({ close }) => (
<> <>
<Popover.Button className="flex cursor-pointer items-center rounded-md border border-custom-border-200 text-xs shadow-sm duration-200"> <Popover.Button>
<span className="flex items-center justify-center gap-2 px-2 py-1 text-xs text-custom-text-200 hover:bg-custom-background-80"> <div
ref={setReferenceElement}
className="cursor-pointer rounded-md border border-custom-border-200 shadow-sm duration-200 flex items-center justify-center gap-2 px-2 py-1 text-xs text-custom-text-200 hover:bg-custom-background-80"
>
{value ? ( {value ? (
<> <>
<span className="text-custom-text-100">{renderShortDateWithYearFormat(value)}</span> <span className="text-custom-text-100">{renderShortDateWithYearFormat(value)}</span>
@ -34,7 +45,7 @@ export const IssueDateSelect: React.FC<Props> = ({ label, maxDate, minDate, onCh
<span>{label}</span> <span>{label}</span>
</> </>
)} )}
</span> </div>
</Popover.Button> </Popover.Button>
<Transition <Transition
@ -46,7 +57,13 @@ export const IssueDateSelect: React.FC<Props> = ({ label, maxDate, minDate, onCh
leaveFrom="opacity-100 translate-y-0" leaveFrom="opacity-100 translate-y-0"
leaveTo="opacity-0 translate-y-1" leaveTo="opacity-0 translate-y-1"
> >
<Popover.Panel className="absolute top-10 -left-10 z-20 transform overflow-hidden"> <Popover.Panel>
<div
className="absolute top-10 -left-10 z-20 transform overflow-hidden"
ref={setPopperElement}
style={styles.popper}
{...attributes.popper}
>
<DatePicker <DatePicker
selected={value ? new Date(value) : null} selected={value ? new Date(value) : null}
onChange={(val) => { onChange={(val) => {
@ -60,9 +77,11 @@ export const IssueDateSelect: React.FC<Props> = ({ label, maxDate, minDate, onCh
maxDate={maxDate} maxDate={maxDate}
inline inline
/> />
</div>
</Popover.Panel> </Popover.Panel>
</Transition> </Transition>
</> </>
)} )}
</Popover> </Popover>
); );
};

View File

@ -1,7 +1,8 @@
import React, { useState } from "react"; import React, { Fragment, useState } from "react";
import { useRouter } from "next/router"; import { useRouter } from "next/router";
import useSWR from "swr"; import useSWR from "swr";
import { Combobox, Transition } from "@headlessui/react"; import { Combobox, Transition } from "@headlessui/react";
import { usePopper } from "react-popper";
// services // services
import { IssueLabelService } from "services/issue"; import { IssueLabelService } from "services/issue";
// ui // ui
@ -29,6 +30,13 @@ export const IssueLabelSelect: React.FC<Props> = ({ setIsOpen, value, onChange,
const router = useRouter(); const router = useRouter();
const { workspaceSlug } = router.query; const { workspaceSlug } = router.query;
const [referenceElement, setReferenceElement] = useState<HTMLDivElement | null>(null);
const [popperElement, setPopperElement] = useState<HTMLDivElement | null>(null);
const { styles, attributes } = usePopper(referenceElement, popperElement, {
placement: "bottom-start",
});
const { data: issueLabels } = useSWR<IIssueLabels[]>( const { data: issueLabels } = useSWR<IIssueLabels[]>(
projectId ? PROJECT_ISSUE_LABELS(projectId) : null, projectId ? PROJECT_ISSUE_LABELS(projectId) : null,
workspaceSlug && projectId workspaceSlug && projectId
@ -43,7 +51,11 @@ export const IssueLabelSelect: React.FC<Props> = ({ setIsOpen, value, onChange,
<Combobox as="div" value={value} onChange={(val) => onChange(val)} className="relative flex-shrink-0" multiple> <Combobox as="div" value={value} onChange={(val) => onChange(val)} className="relative flex-shrink-0" multiple>
{({ open }: any) => ( {({ open }: any) => (
<> <>
<Combobox.Button className="flex items-center gap-2 cursor-pointer text-xs text-custom-text-200"> <Combobox.Button as={Fragment}>
<div
ref={setReferenceElement}
className="flex items-center gap-2 cursor-pointer text-xs text-custom-text-200"
>
{value && value.length > 0 ? ( {value && value.length > 0 ? (
<span className="flex items-center justify-center gap-2 text-xs"> <span className="flex items-center justify-center gap-2 text-xs">
<IssueLabelsList <IssueLabelsList
@ -58,6 +70,7 @@ export const IssueLabelSelect: React.FC<Props> = ({ setIsOpen, value, onChange,
<span className=" text-custom-text-200">Label</span> <span className=" text-custom-text-200">Label</span>
</span> </span>
)} )}
</div>
</Combobox.Button> </Combobox.Button>
<Transition <Transition
@ -70,9 +83,13 @@ export const IssueLabelSelect: React.FC<Props> = ({ setIsOpen, value, onChange,
leaveFrom="opacity-100 translate-y-0" leaveFrom="opacity-100 translate-y-0"
leaveTo="opacity-0 translate-y-1" leaveTo="opacity-0 translate-y-1"
> >
<Combobox.Options <Combobox.Options as={Fragment}>
<div
className={`absolute z-10 mt-1 max-h-52 min-w-[8rem] overflow-auto rounded-md border-none className={`absolute z-10 mt-1 max-h-52 min-w-[8rem] overflow-auto rounded-md border-none
bg-custom-background-90 px-2 py-2 text-xs shadow-md focus:outline-none`} bg-custom-background-90 px-2 py-2 text-xs shadow-md focus:outline-none`}
ref={setPopperElement}
style={styles.popper}
{...attributes.popper}
> >
<div className="flex w-full items-center justify-start rounded-sm border-[0.6px] border-custom-border-200 bg-custom-background-90 px-2"> <div className="flex w-full items-center justify-start rounded-sm border-[0.6px] border-custom-border-200 bg-custom-background-90 px-2">
<Search className="h-3 w-3 text-custom-text-200" /> <Search className="h-3 w-3 text-custom-text-200" />
@ -171,10 +188,11 @@ export const IssueLabelSelect: React.FC<Props> = ({ setIsOpen, value, onChange,
> >
<span className="flex items-center justify-start gap-1 text-custom-text-200"> <span className="flex items-center justify-start gap-1 text-custom-text-200">
<Plus className="h-4 w-4" aria-hidden="true" /> <Plus className="h-4 w-4" aria-hidden="true" />
<span>Create New Label</span> <span className="whitespace-nowrap">Create New Label</span>
</span> </span>
</button> </button>
</div> </div>
</div>
</Combobox.Options> </Combobox.Options>
</Transition> </Transition>
</> </>

View File

@ -1,9 +1,8 @@
import React, { useState } from "react"; import React, { useState } from "react";
import { observer } from "mobx-react-lite"; import { observer } from "mobx-react-lite";
import { usePopper } from "react-popper";
// mobx store // mobx store
import { useMobxStore } from "lib/mobx/store-provider"; import { useMobxStore } from "lib/mobx/store-provider";
// popper js
import { usePopper } from "react-popper";
// ui // ui
import { Combobox } from "@headlessui/react"; import { Combobox } from "@headlessui/react";
// icons // icons