[WEB-2316] chore: Render Tooltips and Drop downs in certain places on hover hover to improve rendering performance (#5456)

* render tooltips and dropdowns in certain places post hover to improve performance

* fix useEffect hooks
This commit is contained in:
rahulramesha
2024-08-29 21:07:49 +05:30
committed by GitHub
parent 33ab6029dc
commit 693085577d
14 changed files with 684 additions and 515 deletions

View File

@@ -0,0 +1,73 @@
import { Combobox } from "@headlessui/react";
import React, {
ElementType,
Fragment,
KeyboardEventHandler,
ReactNode,
Ref,
forwardRef,
useEffect,
useRef,
useState,
} from "react";
type Props = {
as?: ElementType | undefined;
ref?: Ref<HTMLElement> | undefined;
tabIndex?: number | undefined;
className?: string | undefined;
value?: string | string[] | null;
onChange?: (value: any) => void;
disabled?: boolean | undefined;
onKeyDown?: KeyboardEventHandler<HTMLDivElement> | undefined;
multiple?: boolean;
renderByDefault?: boolean;
button: ReactNode;
children: ReactNode;
};
const ComboDropDown = forwardRef((props: Props, ref) => {
const { button, renderByDefault = true, children, ...rest } = props;
const dropDownButtonRef = useRef<HTMLDivElement | null>(null);
const [shouldRender, setShouldRender] = useState(renderByDefault);
const onHover = () => {
setShouldRender(true);
};
useEffect(() => {
const element = dropDownButtonRef.current;
if (!element) return;
element.addEventListener("mouseenter", onHover);
return () => {
element?.removeEventListener("mouseenter", onHover);
};
}, [dropDownButtonRef, shouldRender]);
if (!shouldRender) {
return (
<div ref={dropDownButtonRef} className="h-full flex items-center">
{button}
</div>
);
}
return (
//@ts-ignore
<Combobox {...rest} ref={ref}>
<Combobox.Button as={Fragment}>{button}</Combobox.Button>
{children}
</Combobox>
);
});
const ComboOptions = Combobox.Options;
const ComboOption = Combobox.Option;
const ComboInput = Combobox.Input;
export { ComboDropDown, ComboOptions, ComboOption, ComboInput };

View File

@@ -2,3 +2,4 @@ export * from "./context-menu";
export * from "./custom-menu"; export * from "./custom-menu";
export * from "./custom-select"; export * from "./custom-select";
export * from "./custom-search-select"; export * from "./custom-search-select";
export * from "./combo-box";

View File

@@ -1,4 +1,4 @@
import React from "react"; import React, { useEffect, useRef, useState } from "react";
import { Tooltip2 } from "@blueprintjs/popover2"; import { Tooltip2 } from "@blueprintjs/popover2";
// helpers // helpers
import { cn } from "../../helpers"; import { cn } from "../../helpers";
@@ -42,7 +42,36 @@ export const Tooltip: React.FC<ITooltipProps> = ({
openDelay = 200, openDelay = 200,
closeDelay, closeDelay,
isMobile = false, isMobile = false,
}) => ( }) => {
const toolTipRef = useRef<HTMLDivElement | null>(null);
const [shouldRender, setShouldRender] = useState(false);
const onHover = () => {
setShouldRender(true);
};
useEffect(() => {
const element = toolTipRef.current;
if (!element) return;
element.addEventListener("mouseenter", onHover);
return () => {
element?.removeEventListener("mouseenter", onHover);
};
}, [toolTipRef, shouldRender]);
if (!shouldRender) {
return (
<div ref={toolTipRef} className="h-full flex items-center">
{children}
</div>
);
}
return (
<Tooltip2 <Tooltip2
disabled={disabled} disabled={disabled}
hoverOpenDelay={openDelay} hoverOpenDelay={openDelay}
@@ -76,3 +105,4 @@ export const Tooltip: React.FC<ITooltipProps> = ({
} }
/> />
); );
};

View File

@@ -1,11 +1,10 @@
"use client"; "use client";
import { Fragment, ReactNode, useRef, useState } from "react"; import { ReactNode, useRef, useState } from "react";
import { observer } from "mobx-react"; import { observer } from "mobx-react";
import { ChevronDown } from "lucide-react"; import { ChevronDown } from "lucide-react";
import { Combobox } from "@headlessui/react";
// ui // ui
import { ContrastIcon } from "@plane/ui"; import { ComboDropDown, ContrastIcon } from "@plane/ui";
// helpers // helpers
import { cn } from "@/helpers/common.helper"; import { cn } from "@/helpers/common.helper";
// hooks // hooks
@@ -26,6 +25,7 @@ type Props = TDropdownProps & {
projectId: string | undefined; projectId: string | undefined;
value: string | null; value: string | null;
canRemoveCycle?: boolean; canRemoveCycle?: boolean;
renderByDefault?: boolean;
}; };
export const CycleDropdown: React.FC<Props> = observer((props) => { export const CycleDropdown: React.FC<Props> = observer((props) => {
@@ -48,6 +48,7 @@ export const CycleDropdown: React.FC<Props> = observer((props) => {
tabIndex, tabIndex,
value, value,
canRemoveCycle = true, canRemoveCycle = true,
renderByDefault = true,
} = props; } = props;
// states // states
@@ -72,18 +73,8 @@ export const CycleDropdown: React.FC<Props> = observer((props) => {
handleClose(); handleClose();
}; };
return ( const comboButton = (
<Combobox <>
as="div"
ref={dropdownRef}
tabIndex={tabIndex}
className={cn("h-full", className)}
value={value}
onChange={dropdownOnChange}
disabled={disabled}
onKeyDown={handleKeyDown}
>
<Combobox.Button as={Fragment}>
{button ? ( {button ? (
<button <button
ref={setReferenceElement} ref={setReferenceElement}
@@ -128,7 +119,22 @@ export const CycleDropdown: React.FC<Props> = observer((props) => {
</DropdownButton> </DropdownButton>
</button> </button>
)} )}
</Combobox.Button> </>
);
return (
<ComboDropDown
as="div"
ref={dropdownRef}
tabIndex={tabIndex}
className={cn("h-full", className)}
value={value}
onChange={dropdownOnChange}
disabled={disabled}
onKeyDown={handleKeyDown}
button={comboButton}
renderByDefault={renderByDefault}
>
{isOpen && projectId && ( {isOpen && projectId && (
<CycleOptions <CycleOptions
isOpen={isOpen} isOpen={isOpen}
@@ -138,6 +144,6 @@ export const CycleDropdown: React.FC<Props> = observer((props) => {
canRemoveCycle={canRemoveCycle} canRemoveCycle={canRemoveCycle}
/> />
)} )}
</Combobox> </ComboDropDown>
); );
}); });

View File

@@ -7,7 +7,7 @@ import { usePopper } from "react-popper";
import { ArrowRight, CalendarDays } from "lucide-react"; import { ArrowRight, CalendarDays } from "lucide-react";
import { Combobox } from "@headlessui/react"; import { Combobox } from "@headlessui/react";
// ui // ui
import { Button } from "@plane/ui"; import { Button, ComboDropDown } from "@plane/ui";
// helpers // helpers
import { cn } from "@/helpers/common.helper"; import { cn } from "@/helpers/common.helper";
import { renderFormattedDate } from "@/helpers/date-time.helper"; import { renderFormattedDate } from "@/helpers/date-time.helper";
@@ -49,6 +49,7 @@ type Props = {
from: Date | undefined; from: Date | undefined;
to: Date | undefined; to: Date | undefined;
}; };
renderByDefault?: boolean;
}; };
export const DateRangeDropdown: React.FC<Props> = (props) => { export const DateRangeDropdown: React.FC<Props> = (props) => {
@@ -80,6 +81,7 @@ export const DateRangeDropdown: React.FC<Props> = (props) => {
showTooltip = false, showTooltip = false,
tabIndex, tabIndex,
value, value,
renderByDefault = true,
} = props; } = props;
// states // states
const [isOpen, setIsOpen] = useState(false); const [isOpen, setIsOpen] = useState(false);
@@ -131,20 +133,7 @@ export const DateRangeDropdown: React.FC<Props> = (props) => {
setDateRange(value); setDateRange(value);
}, [value]); }, [value]);
return ( const comboButton = (
<Combobox
as="div"
ref={dropdownRef}
tabIndex={tabIndex}
className={cn("h-full", className)}
onKeyDown={(e) => {
if (e.key === "Enter") {
if (!isOpen) handleKeyDown(e);
} else handleKeyDown(e);
}}
disabled={disabled}
>
<Combobox.Button as={React.Fragment}>
<button <button
ref={setReferenceElement} ref={setReferenceElement}
type="button" type="button"
@@ -173,27 +162,37 @@ export const DateRangeDropdown: React.FC<Props> = (props) => {
variant={buttonVariant} variant={buttonVariant}
> >
<span <span
className={cn( className={cn("h-full flex items-center justify-center gap-1 rounded-sm flex-grow", buttonFromDateClassName)}
"h-full flex items-center justify-center gap-1 rounded-sm flex-grow",
buttonFromDateClassName
)}
> >
{!hideIcon.from && icon} {!hideIcon.from && icon}
{dateRange.from ? renderFormattedDate(dateRange.from) : placeholder.from} {dateRange.from ? renderFormattedDate(dateRange.from) : placeholder.from}
</span> </span>
<ArrowRight className="h-3 w-3 flex-shrink-0" /> <ArrowRight className="h-3 w-3 flex-shrink-0" />
<span <span
className={cn( className={cn("h-full flex items-center justify-center gap-1 rounded-sm flex-grow", buttonToDateClassName)}
"h-full flex items-center justify-center gap-1 rounded-sm flex-grow",
buttonToDateClassName
)}
> >
{!hideIcon.to && icon} {!hideIcon.to && icon}
{dateRange.to ? renderFormattedDate(dateRange.to) : placeholder.to} {dateRange.to ? renderFormattedDate(dateRange.to) : placeholder.to}
</span> </span>
</DropdownButton> </DropdownButton>
</button> </button>
</Combobox.Button> );
return (
<ComboDropDown
as="div"
ref={dropdownRef}
tabIndex={tabIndex}
className={cn("h-full", className)}
onKeyDown={(e) => {
if (e.key === "Enter") {
if (!isOpen) handleKeyDown(e);
} else handleKeyDown(e);
}}
button={comboButton}
disabled={disabled}
renderByDefault={renderByDefault}
>
{isOpen && ( {isOpen && (
<Combobox.Options className="fixed z-10" static> <Combobox.Options className="fixed z-10" static>
<div <div
@@ -250,6 +249,6 @@ export const DateRangeDropdown: React.FC<Props> = (props) => {
</div> </div>
</Combobox.Options> </Combobox.Options>
)} )}
</Combobox> </ComboDropDown>
); );
}; };

View File

@@ -4,6 +4,8 @@ import { createPortal } from "react-dom";
import { usePopper } from "react-popper"; import { usePopper } from "react-popper";
import { CalendarDays, X } from "lucide-react"; import { CalendarDays, X } from "lucide-react";
import { Combobox } from "@headlessui/react"; import { Combobox } from "@headlessui/react";
// ui
import { ComboDropDown } from "@plane/ui";
// helpers // helpers
import { cn } from "@/helpers/common.helper"; import { cn } from "@/helpers/common.helper";
import { renderFormattedDate, getDate } from "@/helpers/date-time.helper"; import { renderFormattedDate, getDate } from "@/helpers/date-time.helper";
@@ -27,6 +29,7 @@ type Props = TDropdownProps & {
value: Date | string | null; value: Date | string | null;
closeOnSelect?: boolean; closeOnSelect?: boolean;
formatToken?: string; formatToken?: string;
renderByDefault?: boolean;
}; };
export const DateDropdown: React.FC<Props> = (props) => { export const DateDropdown: React.FC<Props> = (props) => {
@@ -51,6 +54,7 @@ export const DateDropdown: React.FC<Props> = (props) => {
tabIndex, tabIndex,
value, value,
formatToken, formatToken,
renderByDefault = true,
} = props; } = props;
// states // states
const [isOpen, setIsOpen] = useState(false); const [isOpen, setIsOpen] = useState(false);
@@ -98,20 +102,7 @@ export const DateDropdown: React.FC<Props> = (props) => {
if (minDate) disabledDays.push({ before: minDate }); if (minDate) disabledDays.push({ before: minDate });
if (maxDate) disabledDays.push({ after: maxDate }); if (maxDate) disabledDays.push({ after: maxDate });
return ( const comboButton = (
<Combobox
as="div"
ref={dropdownRef}
tabIndex={tabIndex}
className={cn("h-full", className)}
onKeyDown={(e) => {
if (e.key === "Enter") {
if (!isOpen) handleKeyDown(e);
} else handleKeyDown(e);
}}
disabled={disabled}
>
<Combobox.Button as={React.Fragment}>
<button <button
type="button" type="button"
className={cn( className={cn(
@@ -135,9 +126,7 @@ export const DateDropdown: React.FC<Props> = (props) => {
> >
{!hideIcon && icon} {!hideIcon && icon}
{BUTTON_VARIANTS_WITH_TEXT.includes(buttonVariant) && ( {BUTTON_VARIANTS_WITH_TEXT.includes(buttonVariant) && (
<span className="flex-grow truncate"> <span className="flex-grow truncate">{value ? renderFormattedDate(value, formatToken) : placeholder}</span>
{value ? renderFormattedDate(value, formatToken) : placeholder}
</span>
)} )}
{isClearable && !disabled && isDateSelected && ( {isClearable && !disabled && isDateSelected && (
<X <X
@@ -151,7 +140,23 @@ export const DateDropdown: React.FC<Props> = (props) => {
)} )}
</DropdownButton> </DropdownButton>
</button> </button>
</Combobox.Button> );
return (
<ComboDropDown
as="div"
ref={dropdownRef}
tabIndex={tabIndex}
className={cn("h-full", className)}
onKeyDown={(e) => {
if (e.key === "Enter") {
if (!isOpen) handleKeyDown(e);
} else handleKeyDown(e);
}}
button={comboButton}
disabled={disabled}
renderByDefault={renderByDefault}
>
{isOpen && {isOpen &&
createPortal( createPortal(
<Combobox.Options data-prevent-outside-click static> <Combobox.Options data-prevent-outside-click static>
@@ -176,6 +181,6 @@ export const DateDropdown: React.FC<Props> = (props) => {
</Combobox.Options>, </Combobox.Options>,
document.body document.body
)} )}
</Combobox> </ComboDropDown>
); );
}; };

View File

@@ -1,9 +1,11 @@
import { Fragment, ReactNode, useRef, useState } from "react"; import { ReactNode, useRef, useState } from "react";
import { observer } from "mobx-react"; import { observer } from "mobx-react";
import { useParams } from "next/navigation"; import { useParams } from "next/navigation";
import { usePopper } from "react-popper"; import { usePopper } from "react-popper";
import { Check, ChevronDown, Search, Triangle } from "lucide-react"; import { Check, ChevronDown, Search, Triangle } from "lucide-react";
import { Combobox } from "@headlessui/react"; import { Combobox } from "@headlessui/react";
// ui
import { ComboDropDown } from "@plane/ui";
// helpers // helpers
import { cn } from "@/helpers/common.helper"; import { cn } from "@/helpers/common.helper";
// hooks // hooks
@@ -27,6 +29,7 @@ type Props = TDropdownProps & {
onClose?: () => void; onClose?: () => void;
projectId: string | undefined; projectId: string | undefined;
value: string | undefined | null; value: string | undefined | null;
renderByDefault?: boolean;
}; };
type DropdownOptions = type DropdownOptions =
@@ -56,6 +59,7 @@ export const EstimateDropdown: React.FC<Props> = observer((props) => {
showTooltip = false, showTooltip = false,
tabIndex, tabIndex,
value, value,
renderByDefault = true,
} = props; } = props;
// states // states
const [query, setQuery] = useState(""); const [query, setQuery] = useState("");
@@ -142,18 +146,8 @@ export const EstimateDropdown: React.FC<Props> = observer((props) => {
handleClose(); handleClose();
}; };
return ( const comboButton = (
<Combobox <>
as="div"
ref={dropdownRef}
tabIndex={tabIndex}
className={cn("h-full w-full", className)}
value={value}
onChange={dropdownOnChange}
disabled={disabled}
onKeyDown={handleKeyDown}
>
<Combobox.Button as={Fragment}>
{button ? ( {button ? (
<button <button
ref={setReferenceElement} ref={setReferenceElement}
@@ -195,7 +189,22 @@ export const EstimateDropdown: React.FC<Props> = observer((props) => {
</DropdownButton> </DropdownButton>
</button> </button>
)} )}
</Combobox.Button> </>
);
return (
<ComboDropDown
as="div"
ref={dropdownRef}
tabIndex={tabIndex}
className={cn("h-full w-full", className)}
value={value}
onChange={dropdownOnChange}
disabled={disabled}
onKeyDown={handleKeyDown}
button={comboButton}
renderByDefault={renderByDefault}
>
{isOpen && ( {isOpen && (
<Combobox.Options className="fixed z-10" static> <Combobox.Options className="fixed z-10" static>
<div <div
@@ -263,6 +272,6 @@ export const EstimateDropdown: React.FC<Props> = observer((props) => {
</div> </div>
</Combobox.Options> </Combobox.Options>
)} )}
</Combobox> </ComboDropDown>
); );
}); });

View File

@@ -1,8 +1,8 @@
import { Fragment, useRef, useState } from "react"; import { useRef, useState } from "react";
import { observer } from "mobx-react"; import { observer } from "mobx-react";
import { ChevronDown, LucideIcon } from "lucide-react"; import { ChevronDown, LucideIcon } from "lucide-react";
// headless ui // ui
import { Combobox } from "@headlessui/react"; import { ComboDropDown } from "@plane/ui";
// helpers // helpers
import { cn } from "@/helpers/common.helper"; import { cn } from "@/helpers/common.helper";
// hooks // hooks
@@ -21,6 +21,7 @@ type Props = {
projectId?: string; projectId?: string;
icon?: LucideIcon; icon?: LucideIcon;
onClose?: () => void; onClose?: () => void;
renderByDefault?: boolean;
} & MemberDropdownProps; } & MemberDropdownProps;
export const MemberDropdown: React.FC<Props> = observer((props) => { export const MemberDropdown: React.FC<Props> = observer((props) => {
@@ -46,6 +47,7 @@ export const MemberDropdown: React.FC<Props> = observer((props) => {
tabIndex, tabIndex,
value, value,
icon, icon,
renderByDefault = true,
} = props; } = props;
// states // states
const [isOpen, setIsOpen] = useState(false); const [isOpen, setIsOpen] = useState(false);
@@ -96,17 +98,8 @@ export const MemberDropdown: React.FC<Props> = observer((props) => {
} }
}; };
return ( const comboButton = (
<Combobox <>
as="div"
ref={dropdownRef}
tabIndex={tabIndex}
className={cn("h-full", className)}
onChange={dropdownOnChange}
onKeyDown={handleKeyDown}
{...comboboxProps}
>
<Combobox.Button as={Fragment}>
{button ? ( {button ? (
<button <button
ref={setReferenceElement} ref={setReferenceElement}
@@ -150,7 +143,21 @@ export const MemberDropdown: React.FC<Props> = observer((props) => {
</DropdownButton> </DropdownButton>
</button> </button>
)} )}
</Combobox.Button> </>
);
return (
<ComboDropDown
as="div"
ref={dropdownRef}
tabIndex={tabIndex}
className={cn("h-full", className)}
onChange={dropdownOnChange}
onKeyDown={handleKeyDown}
button={comboButton}
renderByDefault={renderByDefault}
{...comboboxProps}
>
{isOpen && ( {isOpen && (
<MemberOptions <MemberOptions
isOpen={isOpen} isOpen={isOpen}
@@ -159,6 +166,6 @@ export const MemberDropdown: React.FC<Props> = observer((props) => {
referenceElement={referenceElement} referenceElement={referenceElement}
/> />
)} )}
</Combobox> </ComboDropDown>
); );
}); });

View File

@@ -1,11 +1,10 @@
"use client"; "use client";
import { Fragment, ReactNode, useEffect, useRef, useState } from "react"; import { ReactNode, useEffect, useRef, useState } from "react";
import { observer } from "mobx-react"; import { observer } from "mobx-react";
import { ChevronDown, X } from "lucide-react"; import { ChevronDown, X } from "lucide-react";
import { Combobox } from "@headlessui/react";
// ui // ui
import { DiceIcon, Tooltip } from "@plane/ui"; import { ComboDropDown, DiceIcon, Tooltip } from "@plane/ui";
// helpers // helpers
import { cn } from "@/helpers/common.helper"; import { cn } from "@/helpers/common.helper";
// hooks // hooks
@@ -27,6 +26,7 @@ type Props = TDropdownProps & {
projectId: string | undefined; projectId: string | undefined;
showCount?: boolean; showCount?: boolean;
onClose?: () => void; onClose?: () => void;
renderByDefault?: boolean;
} & ( } & (
| { | {
multiple: false; multiple: false;
@@ -170,6 +170,7 @@ export const ModuleDropdown: React.FC<Props> = observer((props) => {
showTooltip = false, showTooltip = false,
tabIndex, tabIndex,
value, value,
renderByDefault = true,
} = props; } = props;
// states // states
const [isOpen, setIsOpen] = useState(false); const [isOpen, setIsOpen] = useState(false);
@@ -207,16 +208,8 @@ export const ModuleDropdown: React.FC<Props> = observer((props) => {
} }
}, [isOpen]); }, [isOpen]);
return ( const comboButton = (
<Combobox <>
as="div"
ref={dropdownRef}
tabIndex={tabIndex}
className={cn("h-full", className)}
onKeyDown={handleKeyDown}
{...comboboxProps}
>
<Combobox.Button as={Fragment}>
{button ? ( {button ? (
<button <button
ref={setReferenceElement} ref={setReferenceElement}
@@ -273,7 +266,20 @@ export const ModuleDropdown: React.FC<Props> = observer((props) => {
</DropdownButton> </DropdownButton>
</button> </button>
)} )}
</Combobox.Button> </>
);
return (
<ComboDropDown
as="div"
ref={dropdownRef}
tabIndex={tabIndex}
className={cn("h-full", className)}
onKeyDown={handleKeyDown}
button={comboButton}
renderByDefault={renderByDefault}
{...comboboxProps}
>
{isOpen && projectId && ( {isOpen && projectId && (
<ModuleOptions <ModuleOptions
isOpen={isOpen} isOpen={isOpen}
@@ -283,6 +289,6 @@ export const ModuleDropdown: React.FC<Props> = observer((props) => {
multiple={multiple} multiple={multiple}
/> />
)} )}
</Combobox> </ComboDropDown>
); );
}); });

View File

@@ -8,7 +8,7 @@ import { Combobox } from "@headlessui/react";
// types // types
import { TIssuePriorities } from "@plane/types"; import { TIssuePriorities } from "@plane/types";
// ui // ui
import { PriorityIcon, Tooltip } from "@plane/ui"; import { ComboDropDown, PriorityIcon, Tooltip } from "@plane/ui";
// constants // constants
import { ISSUE_PRIORITIES } from "@/constants/issue"; import { ISSUE_PRIORITIES } from "@/constants/issue";
// helpers // helpers
@@ -29,6 +29,7 @@ type Props = TDropdownProps & {
onChange: (val: TIssuePriorities) => void; onChange: (val: TIssuePriorities) => void;
onClose?: () => void; onClose?: () => void;
value: TIssuePriorities | undefined | null; value: TIssuePriorities | undefined | null;
renderByDefault?: boolean;
}; };
type ButtonProps = { type ButtonProps = {
@@ -305,6 +306,7 @@ export const PriorityDropdown: React.FC<Props> = (props) => {
showTooltip = false, showTooltip = false,
tabIndex, tabIndex,
value = "none", value = "none",
renderByDefault = true,
} = props; } = props;
// states // states
const [query, setQuery] = useState(""); const [query, setQuery] = useState("");
@@ -366,24 +368,8 @@ export const PriorityDropdown: React.FC<Props> = (props) => {
? BackgroundButton ? BackgroundButton
: TransparentButton; : TransparentButton;
return ( const comboButton = (
<Combobox <>
as="div"
ref={dropdownRef}
tabIndex={tabIndex}
className={cn(
"h-full",
{
"bg-custom-background-80": isOpen,
},
className
)}
value={value}
onChange={dropdownOnChange}
disabled={disabled}
onKeyDown={handleKeyDown}
>
<Combobox.Button as={Fragment}>
{button ? ( {button ? (
<button <button
ref={setReferenceElement} ref={setReferenceElement}
@@ -422,7 +408,28 @@ export const PriorityDropdown: React.FC<Props> = (props) => {
/> />
</button> </button>
)} )}
</Combobox.Button> </>
);
return (
<ComboDropDown
as="div"
ref={dropdownRef}
tabIndex={tabIndex}
className={cn(
"h-full",
{
"bg-custom-background-80": isOpen,
},
className
)}
value={value}
onChange={dropdownOnChange}
disabled={disabled}
onKeyDown={handleKeyDown}
button={comboButton}
renderByDefault={renderByDefault}
>
{isOpen && ( {isOpen && (
<Combobox.Options className="fixed z-10" static> <Combobox.Options className="fixed z-10" static>
<div <div
@@ -471,6 +478,6 @@ export const PriorityDropdown: React.FC<Props> = (props) => {
</div> </div>
</Combobox.Options> </Combobox.Options>
)} )}
</Combobox> </ComboDropDown>
); );
}; };

View File

@@ -5,6 +5,8 @@ import { Check, ChevronDown, Search } from "lucide-react";
import { Combobox } from "@headlessui/react"; import { Combobox } from "@headlessui/react";
// types // types
import { IProject } from "@plane/types"; import { IProject } from "@plane/types";
// ui
import { ComboDropDown } from "@plane/ui";
// components // components
import { Logo } from "@/components/common"; import { Logo } from "@/components/common";
// helpers // helpers
@@ -27,6 +29,7 @@ type Props = TDropdownProps & {
onClose?: () => void; onClose?: () => void;
renderCondition?: (project: IProject) => boolean; renderCondition?: (project: IProject) => boolean;
value: string | null; value: string | null;
renderByDefault?: boolean;
}; };
export const ProjectDropdown: React.FC<Props> = observer((props) => { export const ProjectDropdown: React.FC<Props> = observer((props) => {
@@ -48,6 +51,7 @@ export const ProjectDropdown: React.FC<Props> = observer((props) => {
showTooltip = false, showTooltip = false,
tabIndex, tabIndex,
value, value,
renderByDefault = true,
} = props; } = props;
// states // states
const [query, setQuery] = useState(""); const [query, setQuery] = useState("");
@@ -112,18 +116,8 @@ export const ProjectDropdown: React.FC<Props> = observer((props) => {
handleClose(); handleClose();
}; };
return ( const comboButton = (
<Combobox <>
as="div"
ref={dropdownRef}
tabIndex={tabIndex}
className={cn("h-full", className)}
value={value}
onChange={dropdownOnChange}
disabled={disabled}
onKeyDown={handleKeyDown}
>
<Combobox.Button as={Fragment}>
{button ? ( {button ? (
<button <button
ref={setReferenceElement} ref={setReferenceElement}
@@ -169,7 +163,22 @@ export const ProjectDropdown: React.FC<Props> = observer((props) => {
</DropdownButton> </DropdownButton>
</button> </button>
)} )}
</Combobox.Button> </>
);
return (
<ComboDropDown
as="div"
ref={dropdownRef}
tabIndex={tabIndex}
className={cn("h-full", className)}
value={value}
onChange={dropdownOnChange}
disabled={disabled}
onKeyDown={handleKeyDown}
button={comboButton}
renderByDefault={renderByDefault}
>
{isOpen && ( {isOpen && (
<Combobox.Options className="fixed z-10" static> <Combobox.Options className="fixed z-10" static>
<div <div
@@ -225,6 +234,6 @@ export const ProjectDropdown: React.FC<Props> = observer((props) => {
</div> </div>
</Combobox.Options> </Combobox.Options>
)} )}
</Combobox> </ComboDropDown>
); );
}); });

View File

@@ -7,7 +7,7 @@ import { usePopper } from "react-popper";
import { Check, ChevronDown, Search } from "lucide-react"; import { Check, ChevronDown, Search } from "lucide-react";
import { Combobox } from "@headlessui/react"; import { Combobox } from "@headlessui/react";
// ui // ui
import { Spinner, StateGroupIcon } from "@plane/ui"; import { ComboDropDown, Spinner, StateGroupIcon } from "@plane/ui";
// helpers // helpers
import { cn } from "@/helpers/common.helper"; import { cn } from "@/helpers/common.helper";
// hooks // hooks
@@ -29,6 +29,7 @@ type Props = TDropdownProps & {
projectId: string | undefined; projectId: string | undefined;
showDefaultState?: boolean; showDefaultState?: boolean;
value: string | undefined | null; value: string | undefined | null;
renderByDefault?: boolean;
}; };
export const StateDropdown: React.FC<Props> = observer((props) => { export const StateDropdown: React.FC<Props> = observer((props) => {
@@ -50,6 +51,7 @@ export const StateDropdown: React.FC<Props> = observer((props) => {
showTooltip = false, showTooltip = false,
tabIndex, tabIndex,
value, value,
renderByDefault = true,
} = props; } = props;
// states // states
const [query, setQuery] = useState(""); const [query, setQuery] = useState("");
@@ -125,18 +127,8 @@ export const StateDropdown: React.FC<Props> = observer((props) => {
handleClose(); handleClose();
}; };
return ( const comboButton = (
<Combobox <>
as="div"
ref={dropdownRef}
tabIndex={tabIndex}
className={cn("h-full", className)}
value={stateValue}
onChange={dropdownOnChange}
disabled={disabled}
onKeyDown={handleKeyDown}
>
<Combobox.Button as={Fragment}>
{button ? ( {button ? (
<button <button
ref={setReferenceElement} ref={setReferenceElement}
@@ -183,17 +175,29 @@ export const StateDropdown: React.FC<Props> = observer((props) => {
<span className="flex-grow truncate">{selectedState?.name ?? "State"}</span> <span className="flex-grow truncate">{selectedState?.name ?? "State"}</span>
)} )}
{dropdownArrow && ( {dropdownArrow && (
<ChevronDown <ChevronDown className={cn("h-2.5 w-2.5 flex-shrink-0", dropdownArrowClassName)} aria-hidden="true" />
className={cn("h-2.5 w-2.5 flex-shrink-0", dropdownArrowClassName)}
aria-hidden="true"
/>
)} )}
</> </>
)} )}
</DropdownButton> </DropdownButton>
</button> </button>
)} )}
</Combobox.Button> </>
);
return (
<ComboDropDown
as="div"
ref={dropdownRef}
tabIndex={tabIndex}
className={cn("h-full", className)}
value={stateValue}
onChange={dropdownOnChange}
disabled={disabled}
onKeyDown={handleKeyDown}
button={comboButton}
renderByDefault={renderByDefault}
>
{isOpen && ( {isOpen && (
<Combobox.Options className="fixed z-10" static> <Combobox.Options className="fixed z-10" static>
<div <div
@@ -246,6 +250,6 @@ export const StateDropdown: React.FC<Props> = observer((props) => {
</div> </div>
</Combobox.Options> </Combobox.Options>
)} )}
</Combobox> </ComboDropDown>
); );
}); });

View File

@@ -284,6 +284,7 @@ export const IssueProperties: React.FC<IIssueProperties> = observer((props) => {
projectId={issue.project_id} projectId={issue.project_id}
disabled={isReadOnly} disabled={isReadOnly}
buttonVariant="border-with-text" buttonVariant="border-with-text"
renderByDefault={isMobile}
showTooltip showTooltip
/> />
</div> </div>
@@ -298,6 +299,7 @@ export const IssueProperties: React.FC<IIssueProperties> = observer((props) => {
disabled={isReadOnly} disabled={isReadOnly}
buttonVariant="border-without-text" buttonVariant="border-without-text"
buttonClassName="border" buttonClassName="border"
renderByDefault={isMobile}
showTooltip showTooltip
/> />
</div> </div>
@@ -312,6 +314,7 @@ export const IssueProperties: React.FC<IIssueProperties> = observer((props) => {
defaultOptions={defaultLabelOptions} defaultOptions={defaultLabelOptions}
onChange={handleLabel} onChange={handleLabel}
disabled={isReadOnly} disabled={isReadOnly}
renderByDefault={isMobile}
hideDropdownArrow hideDropdownArrow
/> />
</div> </div>
@@ -328,6 +331,7 @@ export const IssueProperties: React.FC<IIssueProperties> = observer((props) => {
icon={<CalendarClock className="h-3 w-3 flex-shrink-0" />} icon={<CalendarClock className="h-3 w-3 flex-shrink-0" />}
buttonVariant={issue.start_date ? "border-with-text" : "border-without-text"} buttonVariant={issue.start_date ? "border-with-text" : "border-without-text"}
disabled={isReadOnly} disabled={isReadOnly}
renderByDefault={isMobile}
showTooltip showTooltip
/> />
</div> </div>
@@ -346,6 +350,7 @@ export const IssueProperties: React.FC<IIssueProperties> = observer((props) => {
buttonClassName={shouldHighlightIssueDueDate(issue.target_date, stateDetails?.group) ? "text-red-500" : ""} buttonClassName={shouldHighlightIssueDueDate(issue.target_date, stateDetails?.group) ? "text-red-500" : ""}
clearIconClassName="!text-custom-text-100" clearIconClassName="!text-custom-text-100"
disabled={isReadOnly} disabled={isReadOnly}
renderByDefault={isMobile}
showTooltip showTooltip
/> />
</div> </div>
@@ -365,6 +370,7 @@ export const IssueProperties: React.FC<IIssueProperties> = observer((props) => {
showTooltip={issue?.assignee_ids?.length === 0} showTooltip={issue?.assignee_ids?.length === 0}
placeholder="Assignees" placeholder="Assignees"
tooltipContent="" tooltipContent=""
renderByDefault={isMobile}
/> />
</div> </div>
</WithDisplayPropertiesHOC> </WithDisplayPropertiesHOC>
@@ -379,6 +385,7 @@ export const IssueProperties: React.FC<IIssueProperties> = observer((props) => {
value={issue?.module_ids ?? []} value={issue?.module_ids ?? []}
onChange={handleModule} onChange={handleModule}
disabled={isReadOnly} disabled={isReadOnly}
renderByDefault={isMobile}
multiple multiple
buttonVariant="border-with-text" buttonVariant="border-with-text"
showCount showCount
@@ -399,6 +406,7 @@ export const IssueProperties: React.FC<IIssueProperties> = observer((props) => {
onChange={handleCycle} onChange={handleCycle}
disabled={isReadOnly} disabled={isReadOnly}
buttonVariant="border-with-text" buttonVariant="border-with-text"
renderByDefault={isMobile}
showTooltip showTooltip
/> />
</div> </div>
@@ -415,6 +423,7 @@ export const IssueProperties: React.FC<IIssueProperties> = observer((props) => {
projectId={issue.project_id} projectId={issue.project_id}
disabled={isReadOnly} disabled={isReadOnly}
buttonVariant="border-with-text" buttonVariant="border-with-text"
renderByDefault={isMobile}
showTooltip showTooltip
/> />
</div> </div>

View File

@@ -10,7 +10,7 @@ import { Combobox } from "@headlessui/react";
// types // types
import { IIssueLabel } from "@plane/types"; import { IIssueLabel } from "@plane/types";
// ui // ui
import { Tooltip } from "@plane/ui"; import { ComboDropDown, Tooltip } from "@plane/ui";
// hooks // hooks
import { useLabel } from "@/hooks/store"; import { useLabel } from "@/hooks/store";
import { useDropdownKeyDown } from "@/hooks/use-dropdown-key-down"; import { useDropdownKeyDown } from "@/hooks/use-dropdown-key-down";
@@ -32,6 +32,7 @@ export interface IIssuePropertyLabels {
noLabelBorder?: boolean; noLabelBorder?: boolean;
placeholderText?: string; placeholderText?: string;
onClose?: () => void; onClose?: () => void;
renderByDefault?: boolean;
} }
export const IssuePropertyLabels: React.FC<IIssuePropertyLabels> = observer((props) => { export const IssuePropertyLabels: React.FC<IIssuePropertyLabels> = observer((props) => {
@@ -50,6 +51,7 @@ export const IssuePropertyLabels: React.FC<IIssuePropertyLabels> = observer((pro
maxRender = 2, maxRender = 2,
noLabelBorder = false, noLabelBorder = false,
placeholderText, placeholderText,
renderByDefault = true,
} = props; } = props;
// router // router
const { workspaceSlug: routerWorkspaceSlug } = useParams(); const { workspaceSlug: routerWorkspaceSlug } = useParams();
@@ -217,18 +219,7 @@ export const IssuePropertyLabels: React.FC<IIssuePropertyLabels> = observer((pro
</div> </div>
); );
return ( const comboButton = (
<Combobox
as="div"
ref={dropdownRef}
className={`w-auto max-w-full flex-shrink-0 text-left ${className}`}
value={value}
onChange={onChange}
disabled={disabled}
onKeyDown={handleKeyDown}
multiple
>
<Combobox.Button as={Fragment}>
<button <button
ref={setReferenceElement} ref={setReferenceElement}
type="button" type="button"
@@ -244,8 +235,21 @@ export const IssuePropertyLabels: React.FC<IIssuePropertyLabels> = observer((pro
{label} {label}
{!hideDropdownArrow && !disabled && <ChevronDown className="h-3 w-3" aria-hidden="true" />} {!hideDropdownArrow && !disabled && <ChevronDown className="h-3 w-3" aria-hidden="true" />}
</button> </button>
</Combobox.Button> );
return (
<ComboDropDown
as="div"
ref={dropdownRef}
className={`w-auto max-w-full flex-shrink-0 text-left ${className}`}
value={value}
onChange={onChange}
disabled={disabled}
onKeyDown={handleKeyDown}
button={comboButton}
renderByDefault={renderByDefault}
multiple
>
{isOpen && ( {isOpen && (
<Combobox.Options className="fixed z-10" static> <Combobox.Options className="fixed z-10" static>
<div <div
@@ -307,6 +311,6 @@ export const IssuePropertyLabels: React.FC<IIssuePropertyLabels> = observer((pro
</div> </div>
</Combobox.Options> </Combobox.Options>
)} )}
</Combobox> </ComboDropDown>
); );
}); });