π₯π₯π₯ 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
[WEB-2580] chore: improvements for custom search select. (#5744)
Prateek Shourya51b01ebcac92
diff --git a/packages/ui/src/dropdowns/custom-search-select.tsx b/packages/ui/src/dropdowns/custom-search-select.tsxindex 81d33df6ea..7842f1531d 100644--- a/packages/ui/src/dropdowns/custom-search-select.tsx+++ b/packages/ui/src/dropdowns/custom-search-select.tsx@@ -1,7 +1,7 @@import React, { useRef, useState } from "react";import { usePopper } from "react-popper";import { Combobox } from "@headlessui/react";-import { Check, ChevronDown, Search } from "lucide-react";+import { Check, ChevronDown, Info, Search } from "lucide-react";import { createPortal } from "react-dom";// plane helpersimport { useOutsideClickDetector } from "@plane/helpers";@@ -11,6 +11,8 @@ import { useDropdownKeyDown } from "../hooks/use-dropdown-key-down";import { cn } from "../../helpers";// typesimport { ICustomSearchSelectProps } from "./helper";+// local components+import { Tooltip } from "../tooltip";export const CustomSearchSelect = (props: ICustomSearchSelectProps) => {const {@@ -95,11 +97,10 @@ export const CustomSearchSelect = (props: ICustomSearchSelectProps) => {<buttonref={setReferenceElement}type="button"- className={`flex w-full items-center justify-between gap-1 text-xs ${- disabled- ? "cursor-not-allowed text-custom-text-200"- : "cursor-pointer hover:bg-custom-background-80"- } ${customButtonClassName}`}+ className={`flex w-full items-center justify-between gap-1 text-xs ${disabled+ ? "cursor-not-allowed text-custom-text-200"+ : "cursor-pointer hover:bg-custom-background-80"+ } ${customButtonClassName}`}onClick={toggleDropdown}>{customButton}@@ -170,17 +171,32 @@ export const CustomSearchSelect = (props: ICustomSearchSelectProps) => {"w-full truncate flex items-center justify-between gap-2 rounded px-1 py-1.5 cursor-pointer select-none",{"bg-custom-background-80": active,+ "text-custom-text-400 opacity-60 cursor-not-allowed": option.disabled,})}onClick={() => {if (!multiple) closeDropdown();}}+ disabled={option.disabled}>{({ selected }) => (<><span className="flex-grow truncate">{option.content}</span>{selected && <Check className="h-3.5 w-3.5 flex-shrink-0" />}+ {option.tooltip && (+ <>+ {+ typeof option.tooltip === "string" ? (+ <Tooltip tooltipContent={option.tooltip}>+ <Info className="h-3.5 w-3.5 flex-shrink-0 cursor-pointer text-custom-text-200" />+ </Tooltip>+ ) : (+ option.tooltip+ )+ }+ </>+ )}</>)}</Combobox.Option>diff --git a/packages/ui/src/dropdowns/helper.tsx b/packages/ui/src/dropdowns/helper.tsxindex 56963cbf4b..a7ef61c3de 100644--- a/packages/ui/src/dropdowns/helper.tsx+++ b/packages/ui/src/dropdowns/helper.tsx@@ -44,12 +44,14 @@ interface CustomSearchSelectProps {onChange: any;onClose?: () => void;options:- | {- value: any;- query: string;- content: React.ReactNode;- }[]- | undefined;+ | {+ value: any;+ query: string;+ content: React.ReactNode;+ disabled?: boolean;+ tooltip?: string | React.ReactNode;+ }[]+ | undefined;}interface SingleValueProps {diff --git a/web/ce/components/issues/issue-modal/issue-type-select.tsx b/web/ce/components/issues/issue-modal/issue-type-select.tsxindex a4b60103d6..9514cb78f5 100644--- a/web/ce/components/issues/issue-modal/issue-type-select.tsx+++ b/web/ce/components/issues/issue-modal/issue-type-select.tsx@@ -1,12 +1,23 @@import { Control } from "react-hook-form";// types-import { TIssue } from "@plane/types";+import { TBulkIssueProperties, TIssue } from "@plane/types";-type TIssueTypeSelectProps = {- control: Control<TIssue>;+export type TIssueFields = TIssue & TBulkIssueProperties;++export type TIssueTypeDropdownVariant = "xs" | "sm";++export type TIssueTypeSelectProps<T extends Partial<TIssueFields>> = {+ control: Control<T>;projectId: string | null;disabled?: boolean;- handleFormChange: () => void;+ variant?: TIssueTypeDropdownVariant;+ placeholder?: string;+ isRequired?: boolean;+ renderChevron?: boolean;+ dropDownContainerClassName?: string;+ showMandatoryFieldInfo?: boolean; // Show info about mandatory fields+ handleFormChange?: () => void;};-export const IssueTypeSelect: React.FC<TIssueTypeSelectProps> = () => <></>;+// eslint-disable-next-line @typescript-eslint/no-unused-vars+export const IssueTypeSelect = <T extends Partial<TIssueFields>>(props: TIssueTypeSelectProps<T>) => <></>;diff --git a/web/core/components/issues/issue-modal/form.tsx b/web/core/components/issues/issue-modal/form.tsxindex ec6c421927..35785d3487 100644--- a/web/core/components/issues/issue-modal/form.tsx+++ b/web/core/components/issues/issue-modal/form.tsx@@ -280,6 +280,7 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {projectId={projectId}disabled={!!data?.sourceIssueId}handleFormChange={handleFormChange}+ renderChevron/>)}</div>