mirror of
https://github.com/makeplane/plane
synced 2024-06-14 14:31:34 +00:00
fix: Issue properties dropdown overflow issue for date and labels (#2604)
This commit is contained in:
guru_sainath
GitHub
parent
325fb4a377
commit
f6b95b8d31
@ -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
|
||||||
|
|||||||
@ -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,54 +15,73 @@ 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 }) => {
|
||||||
<Popover className="relative flex items-center justify-center rounded-lg">
|
const [referenceElement, setReferenceElement] = React.useState<HTMLDivElement | null>(null);
|
||||||
{({ close }) => (
|
const [popperElement, setPopperElement] = React.useState<HTMLDivElement | null>(null);
|
||||||
<>
|
|
||||||
<Popover.Button className="flex cursor-pointer items-center rounded-md border border-custom-border-200 text-xs shadow-sm duration-200">
|
|
||||||
<span className="flex items-center justify-center gap-2 px-2 py-1 text-xs text-custom-text-200 hover:bg-custom-background-80">
|
|
||||||
{value ? (
|
|
||||||
<>
|
|
||||||
<span className="text-custom-text-100">{renderShortDateWithYearFormat(value)}</span>
|
|
||||||
<button onClick={() => onChange(null)}>
|
|
||||||
<X className="h-3 w-3" />
|
|
||||||
</button>
|
|
||||||
</>
|
|
||||||
) : (
|
|
||||||
<>
|
|
||||||
<CalendarDays className="h-3.5 w-3.5 flex-shrink-0" />
|
|
||||||
<span>{label}</span>
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
</span>
|
|
||||||
</Popover.Button>
|
|
||||||
|
|
||||||
<Transition
|
const { styles, attributes } = usePopper(referenceElement, popperElement, {
|
||||||
as={React.Fragment}
|
placement: "bottom-start",
|
||||||
enter="transition ease-out duration-200"
|
});
|
||||||
enterFrom="opacity-0 translate-y-1"
|
|
||||||
enterTo="opacity-100 translate-y-0"
|
|
||||||
leave="transition ease-in duration-150"
|
|
||||||
leaveFrom="opacity-100 translate-y-0"
|
|
||||||
leaveTo="opacity-0 translate-y-1"
|
|
||||||
>
|
|
||||||
<Popover.Panel className="absolute top-10 -left-10 z-20 transform overflow-hidden">
|
|
||||||
<DatePicker
|
|
||||||
selected={value ? new Date(value) : null}
|
|
||||||
onChange={(val) => {
|
|
||||||
if (!val) onChange("");
|
|
||||||
else onChange(renderDateFormat(val));
|
|
||||||
|
|
||||||
close();
|
return (
|
||||||
}}
|
<Popover className="relative flex items-center justify-center rounded-lg">
|
||||||
dateFormat="dd-MM-yyyy"
|
{({ close }) => (
|
||||||
minDate={minDate}
|
<>
|
||||||
maxDate={maxDate}
|
<Popover.Button>
|
||||||
inline
|
<div
|
||||||
/>
|
ref={setReferenceElement}
|
||||||
</Popover.Panel>
|
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"
|
||||||
</Transition>
|
>
|
||||||
</>
|
{value ? (
|
||||||
)}
|
<>
|
||||||
</Popover>
|
<span className="text-custom-text-100">{renderShortDateWithYearFormat(value)}</span>
|
||||||
);
|
<button onClick={() => onChange(null)}>
|
||||||
|
<X className="h-3 w-3" />
|
||||||
|
</button>
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
<>
|
||||||
|
<CalendarDays className="h-3.5 w-3.5 flex-shrink-0" />
|
||||||
|
<span>{label}</span>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</Popover.Button>
|
||||||
|
|
||||||
|
<Transition
|
||||||
|
as={React.Fragment}
|
||||||
|
enter="transition ease-out duration-200"
|
||||||
|
enterFrom="opacity-0 translate-y-1"
|
||||||
|
enterTo="opacity-100 translate-y-0"
|
||||||
|
leave="transition ease-in duration-150"
|
||||||
|
leaveFrom="opacity-100 translate-y-0"
|
||||||
|
leaveTo="opacity-0 translate-y-1"
|
||||||
|
>
|
||||||
|
<Popover.Panel>
|
||||||
|
<div
|
||||||
|
className="absolute top-10 -left-10 z-20 transform overflow-hidden"
|
||||||
|
ref={setPopperElement}
|
||||||
|
style={styles.popper}
|
||||||
|
{...attributes.popper}
|
||||||
|
>
|
||||||
|
<DatePicker
|
||||||
|
selected={value ? new Date(value) : null}
|
||||||
|
onChange={(val) => {
|
||||||
|
if (!val) onChange("");
|
||||||
|
else onChange(renderDateFormat(val));
|
||||||
|
|
||||||
|
close();
|
||||||
|
}}
|
||||||
|
dateFormat="dd-MM-yyyy"
|
||||||
|
minDate={minDate}
|
||||||
|
maxDate={maxDate}
|
||||||
|
inline
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</Popover.Panel>
|
||||||
|
</Transition>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</Popover>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|||||||
@ -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,21 +51,26 @@ 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}>
|
||||||
{value && value.length > 0 ? (
|
<div
|
||||||
<span className="flex items-center justify-center gap-2 text-xs">
|
ref={setReferenceElement}
|
||||||
<IssueLabelsList
|
className="flex items-center gap-2 cursor-pointer text-xs text-custom-text-200"
|
||||||
labels={value.map((v) => issueLabels?.find((l) => l.id === v)) ?? []}
|
>
|
||||||
length={3}
|
{value && value.length > 0 ? (
|
||||||
showLength
|
<span className="flex items-center justify-center gap-2 text-xs">
|
||||||
/>
|
<IssueLabelsList
|
||||||
</span>
|
labels={value.map((v) => issueLabels?.find((l) => l.id === v)) ?? []}
|
||||||
) : (
|
length={3}
|
||||||
<span className="flex items-center justify-center gap-2 px-2 py-1 text-xs rounded shadow-sm border border-custom-border-300 hover:bg-custom-background-80">
|
showLength
|
||||||
<Tag className="h-3.5 w-3.5 text-custom-text-200" />
|
/>
|
||||||
<span className=" text-custom-text-200">Label</span>
|
</span>
|
||||||
</span>
|
) : (
|
||||||
)}
|
<span className="flex items-center justify-center gap-2 px-2 py-1 text-xs rounded shadow-sm border border-custom-border-300 hover:bg-custom-background-80">
|
||||||
|
<Tag className="h-3.5 w-3.5 text-custom-text-200" />
|
||||||
|
<span className=" text-custom-text-200">Label</span>
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
</Combobox.Button>
|
</Combobox.Button>
|
||||||
|
|
||||||
<Transition
|
<Transition
|
||||||
@ -70,110 +83,115 @@ 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}>
|
||||||
className={`absolute z-10 mt-1 max-h-52 min-w-[8rem] overflow-auto rounded-md border-none
|
<div
|
||||||
|
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}
|
||||||
<div className="flex w-full items-center justify-start rounded-sm border-[0.6px] border-custom-border-200 bg-custom-background-90 px-2">
|
style={styles.popper}
|
||||||
<Search className="h-3 w-3 text-custom-text-200" />
|
{...attributes.popper}
|
||||||
<Combobox.Input
|
>
|
||||||
className="w-full bg-transparent py-1 px-2 text-xs text-custom-text-200 focus:outline-none"
|
<div className="flex w-full items-center justify-start rounded-sm border-[0.6px] border-custom-border-200 bg-custom-background-90 px-2">
|
||||||
onChange={(event) => setQuery(event.target.value)}
|
<Search className="h-3 w-3 text-custom-text-200" />
|
||||||
placeholder="Search for label..."
|
<Combobox.Input
|
||||||
displayValue={(assigned: any) => assigned?.name}
|
className="w-full bg-transparent py-1 px-2 text-xs text-custom-text-200 focus:outline-none"
|
||||||
/>
|
onChange={(event) => setQuery(event.target.value)}
|
||||||
</div>
|
placeholder="Search for label..."
|
||||||
<div className="py-1.5">
|
displayValue={(assigned: any) => assigned?.name}
|
||||||
{issueLabels && filteredOptions ? (
|
/>
|
||||||
filteredOptions.length > 0 ? (
|
</div>
|
||||||
filteredOptions.map((label) => {
|
<div className="py-1.5">
|
||||||
const children = issueLabels?.filter((l) => l.parent === label.id);
|
{issueLabels && filteredOptions ? (
|
||||||
|
filteredOptions.length > 0 ? (
|
||||||
|
filteredOptions.map((label) => {
|
||||||
|
const children = issueLabels?.filter((l) => l.parent === label.id);
|
||||||
|
|
||||||
if (children.length === 0) {
|
if (children.length === 0) {
|
||||||
if (!label.parent)
|
if (!label.parent)
|
||||||
return (
|
return (
|
||||||
<Combobox.Option
|
<Combobox.Option
|
||||||
key={label.id}
|
key={label.id}
|
||||||
className={({ active }) =>
|
className={({ active }) =>
|
||||||
`${
|
`${
|
||||||
active ? "bg-custom-background-80" : ""
|
active ? "bg-custom-background-80" : ""
|
||||||
} group flex min-w-[14rem] cursor-pointer select-none items-center gap-2 truncate rounded px-1 py-1.5 text-custom-text-200`
|
} group flex min-w-[14rem] cursor-pointer select-none items-center gap-2 truncate rounded px-1 py-1.5 text-custom-text-200`
|
||||||
}
|
}
|
||||||
value={label.id}
|
value={label.id}
|
||||||
>
|
>
|
||||||
{({ selected }) => (
|
{({ selected }) => (
|
||||||
<div className="flex w-full justify-between gap-2 rounded">
|
<div className="flex w-full justify-between gap-2 rounded">
|
||||||
<div className="flex items-center justify-start gap-2">
|
<div className="flex items-center justify-start gap-2">
|
||||||
<span
|
<span
|
||||||
className="h-2.5 w-2.5 flex-shrink-0 rounded-full"
|
className="h-2.5 w-2.5 flex-shrink-0 rounded-full"
|
||||||
style={{
|
style={{
|
||||||
backgroundColor: label.color,
|
backgroundColor: label.color,
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<span>{label.name}</span>
|
<span>{label.name}</span>
|
||||||
</div>
|
|
||||||
<div className="flex items-center justify-center rounded p-1">
|
|
||||||
<Check className={`h-3 w-3 ${selected ? "opacity-100" : "opacity-0"}`} />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</Combobox.Option>
|
|
||||||
);
|
|
||||||
} else
|
|
||||||
return (
|
|
||||||
<div className="border-y border-custom-border-200">
|
|
||||||
<div className="flex select-none items-center gap-2 truncate p-2 text-custom-text-100">
|
|
||||||
<Component className="h-3 w-3" /> {label.name}
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
{children.map((child) => (
|
|
||||||
<Combobox.Option
|
|
||||||
key={child.id}
|
|
||||||
className={({ active }) =>
|
|
||||||
`${
|
|
||||||
active ? "bg-custom-background-80" : ""
|
|
||||||
} group flex min-w-[14rem] cursor-pointer select-none items-center gap-2 truncate rounded px-1 py-1.5 text-custom-text-200`
|
|
||||||
}
|
|
||||||
value={child.id}
|
|
||||||
>
|
|
||||||
{({ selected }) => (
|
|
||||||
<div className="flex w-full justify-between gap-2 rounded">
|
|
||||||
<div className="flex items-center justify-start gap-2">
|
|
||||||
<span
|
|
||||||
className="h-2.5 w-2.5 flex-shrink-0 rounded-full"
|
|
||||||
style={{
|
|
||||||
backgroundColor: child?.color,
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
<span>{child.name}</span>
|
|
||||||
</div>
|
|
||||||
<div className="flex items-center justify-center rounded p-1">
|
|
||||||
<Check className={`h-3 w-3 ${selected ? "opacity-100" : "opacity-0"}`} />
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
)}
|
<div className="flex items-center justify-center rounded p-1">
|
||||||
</Combobox.Option>
|
<Check className={`h-3 w-3 ${selected ? "opacity-100" : "opacity-0"}`} />
|
||||||
))}
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</Combobox.Option>
|
||||||
|
);
|
||||||
|
} else
|
||||||
|
return (
|
||||||
|
<div className="border-y border-custom-border-200">
|
||||||
|
<div className="flex select-none items-center gap-2 truncate p-2 text-custom-text-100">
|
||||||
|
<Component className="h-3 w-3" /> {label.name}
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
{children.map((child) => (
|
||||||
|
<Combobox.Option
|
||||||
|
key={child.id}
|
||||||
|
className={({ active }) =>
|
||||||
|
`${
|
||||||
|
active ? "bg-custom-background-80" : ""
|
||||||
|
} group flex min-w-[14rem] cursor-pointer select-none items-center gap-2 truncate rounded px-1 py-1.5 text-custom-text-200`
|
||||||
|
}
|
||||||
|
value={child.id}
|
||||||
|
>
|
||||||
|
{({ selected }) => (
|
||||||
|
<div className="flex w-full justify-between gap-2 rounded">
|
||||||
|
<div className="flex items-center justify-start gap-2">
|
||||||
|
<span
|
||||||
|
className="h-2.5 w-2.5 flex-shrink-0 rounded-full"
|
||||||
|
style={{
|
||||||
|
backgroundColor: child?.color,
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<span>{child.name}</span>
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center justify-center rounded p-1">
|
||||||
|
<Check className={`h-3 w-3 ${selected ? "opacity-100" : "opacity-0"}`} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</Combobox.Option>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
);
|
||||||
);
|
})
|
||||||
})
|
) : (
|
||||||
|
<p className="px-2 text-xs text-custom-text-200">No labels found</p>
|
||||||
|
)
|
||||||
) : (
|
) : (
|
||||||
<p className="px-2 text-xs text-custom-text-200">No labels found</p>
|
<p className="px-2 text-xs text-custom-text-200">Loading...</p>
|
||||||
)
|
)}
|
||||||
) : (
|
<button
|
||||||
<p className="px-2 text-xs text-custom-text-200">Loading...</p>
|
type="button"
|
||||||
)}
|
className="flex w-full select-none items-center rounded py-2 px-1 hover:bg-custom-background-80"
|
||||||
<button
|
onClick={() => setIsOpen(true)}
|
||||||
type="button"
|
>
|
||||||
className="flex w-full select-none items-center rounded py-2 px-1 hover:bg-custom-background-80"
|
<span className="flex items-center justify-start gap-1 text-custom-text-200">
|
||||||
onClick={() => setIsOpen(true)}
|
<Plus className="h-4 w-4" aria-hidden="true" />
|
||||||
>
|
<span className="whitespace-nowrap">Create New Label</span>
|
||||||
<span className="flex items-center justify-start gap-1 text-custom-text-200">
|
</span>
|
||||||
<Plus className="h-4 w-4" aria-hidden="true" />
|
</button>
|
||||||
<span>Create New Label</span>
|
</div>
|
||||||
</span>
|
|
||||||
</button>
|
|
||||||
</div>
|
</div>
|
||||||
</Combobox.Options>
|
</Combobox.Options>
|
||||||
</Transition>
|
</Transition>
|
||||||
|
|||||||
@ -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
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user