π₯π₯π₯ 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
chore: dropdown and peek overview improvement (#3682)
Anmol Singh Bhatia665a07f15ab9
diff --git a/web/components/dropdowns/cycle.tsx b/web/components/dropdowns/cycle.tsxindex e3aa6df11d..5086d2d26b 100644--- a/web/components/dropdowns/cycle.tsx+++ b/web/components/dropdowns/cycle.tsx@@ -61,6 +61,7 @@ export const CycleDropdown: React.FC<Props> = observer((props) => {const [isOpen, setIsOpen] = useState(false);// refsconst dropdownRef = useRef<HTMLDivElement | null>(null);+ const inputRef = useRef<HTMLInputElement | null>(null);// popper-js refsconst [referenceElement, setReferenceElement] = useState<HTMLButtonElement | null>(null);const [popperElement, setPopperElement] = useState<HTMLDivElement | null>(null);@@ -111,23 +112,15 @@ export const CycleDropdown: React.FC<Props> = observer((props) => {const filteredOptions =query === "" ? options : options?.filter((o) => o.query.toLowerCase().includes(query.toLowerCase()));- // fetch cycles of the project if not already present in the store- useEffect(() => {- if (!workspaceSlug) return;-- if (!cycleIds) fetchAllCycles(workspaceSlug, projectId);- }, [cycleIds, fetchAllCycles, projectId, workspaceSlug]);-const selectedCycle = value ? getCycleById(value) : null;const onOpen = () => {- if (referenceElement) referenceElement.focus();+ if (workspaceSlug && !cycleIds) fetchAllCycles(workspaceSlug, projectId);};const handleClose = () => {if (!isOpen) return;setIsOpen(false);- if (referenceElement) referenceElement.blur();onClose && onClose();};@@ -151,6 +144,12 @@ export const CycleDropdown: React.FC<Props> = observer((props) => {useOutsideClickDetector(dropdownRef, handleClose);+ useEffect(() => {+ if (isOpen && inputRef.current) {+ inputRef.current.focus();+ }+ }, [isOpen]);+return (<Comboboxas="div"@@ -216,6 +215,8 @@ export const CycleDropdown: React.FC<Props> = observer((props) => {<div className="flex items-center gap-1.5 rounded border border-custom-border-100 bg-custom-background-90 px-2"><Search className="h-3.5 w-3.5 text-custom-text-400" strokeWidth={1.5} /><Combobox.Input+ as="input"+ ref={inputRef}className="w-full bg-transparent py-1 text-xs text-custom-text-200 placeholder:text-custom-text-400 focus:outline-none"value={query}onChange={(e) => setQuery(e.target.value)}diff --git a/web/components/dropdowns/estimate.tsx b/web/components/dropdowns/estimate.tsxindex 48558a683f..2674fa902d 100644--- a/web/components/dropdowns/estimate.tsx+++ b/web/components/dropdowns/estimate.tsx@@ -1,4 +1,4 @@-import { Fragment, ReactNode, useRef, useState } from "react";+import { Fragment, ReactNode, useEffect, useRef, useState } from "react";import { observer } from "mobx-react-lite";import { Combobox } from "@headlessui/react";import { usePopper } from "react-popper";@@ -60,6 +60,7 @@ export const EstimateDropdown: React.FC<Props> = observer((props) => {const [isOpen, setIsOpen] = useState(false);// refsconst dropdownRef = useRef<HTMLDivElement | null>(null);+ const inputRef = useRef<HTMLInputElement | null>(null);// popper-js refsconst [referenceElement, setReferenceElement] = useState<HTMLButtonElement | null>(null);const [popperElement, setPopperElement] = useState<HTMLDivElement | null>(null);@@ -110,13 +111,11 @@ export const EstimateDropdown: React.FC<Props> = observer((props) => {const onOpen = () => {if (!activeEstimate && workspaceSlug) fetchProjectEstimates(workspaceSlug, projectId);- if (referenceElement) referenceElement.focus();};const handleClose = () => {if (!isOpen) return;setIsOpen(false);- if (referenceElement) referenceElement.blur();onClose && onClose();};@@ -140,6 +139,12 @@ export const EstimateDropdown: React.FC<Props> = observer((props) => {useOutsideClickDetector(dropdownRef, handleClose);+ useEffect(() => {+ if (isOpen && inputRef.current) {+ inputRef.current.focus();+ }+ }, [isOpen]);+return (<Comboboxas="div"@@ -205,6 +210,8 @@ export const EstimateDropdown: React.FC<Props> = observer((props) => {<div className="flex items-center gap-1.5 rounded border border-custom-border-100 bg-custom-background-90 px-2"><Search className="h-3.5 w-3.5 text-custom-text-400" strokeWidth={1.5} /><Combobox.Input+ as="input"+ ref={inputRef}className="w-full bg-transparent py-1 text-xs text-custom-text-200 placeholder:text-custom-text-400 focus:outline-none"value={query}onChange={(e) => setQuery(e.target.value)}diff --git a/web/components/dropdowns/member/project-member.tsx b/web/components/dropdowns/member/project-member.tsxindex 44cd3a7016..d1f285aa55 100644--- a/web/components/dropdowns/member/project-member.tsx+++ b/web/components/dropdowns/member/project-member.tsx@@ -1,4 +1,4 @@-import { Fragment, useRef, useState } from "react";+import { Fragment, useEffect, useRef, useState } from "react";import { observer } from "mobx-react-lite";import { Combobox } from "@headlessui/react";import { usePopper } from "react-popper";@@ -50,6 +50,7 @@ export const ProjectMemberDropdown: React.FC<Props> = observer((props) => {const [isOpen, setIsOpen] = useState(false);// refsconst dropdownRef = useRef<HTMLDivElement | null>(null);+ const inputRef = useRef<HTMLInputElement | null>(null);// popper-js refsconst [referenceElement, setReferenceElement] = useState<HTMLButtonElement | null>(null);const [popperElement, setPopperElement] = useState<HTMLDivElement | null>(null);@@ -103,13 +104,11 @@ export const ProjectMemberDropdown: React.FC<Props> = observer((props) => {const onOpen = () => {if (!projectMemberIds && workspaceSlug) fetchProjectMembers(workspaceSlug, projectId);- if (referenceElement) referenceElement.focus();};const handleClose = () => {if (!isOpen) return;setIsOpen(false);- if (referenceElement) referenceElement.blur();onClose && onClose();};@@ -133,6 +132,12 @@ export const ProjectMemberDropdown: React.FC<Props> = observer((props) => {useOutsideClickDetector(dropdownRef, handleClose);+ useEffect(() => {+ if (isOpen && inputRef.current) {+ inputRef.current.focus();+ }+ }, [isOpen]);+return (<Comboboxas="div"@@ -203,6 +208,8 @@ export const ProjectMemberDropdown: React.FC<Props> = observer((props) => {<div className="flex items-center gap-1.5 rounded border border-custom-border-100 bg-custom-background-90 px-2"><Search className="h-3.5 w-3.5 text-custom-text-400" strokeWidth={1.5} /><Combobox.Input+ as="input"+ ref={inputRef}className="w-full bg-transparent py-1 text-xs text-custom-text-200 placeholder:text-custom-text-400 focus:outline-none"value={query}onChange={(e) => setQuery(e.target.value)}diff --git a/web/components/dropdowns/member/workspace-member.tsx b/web/components/dropdowns/member/workspace-member.tsxindex d126b60f72..7a2628ccaf 100644--- a/web/components/dropdowns/member/workspace-member.tsx+++ b/web/components/dropdowns/member/workspace-member.tsx@@ -1,4 +1,4 @@-import { Fragment, useRef, useState } from "react";+import { Fragment, useEffect, useRef, useState } from "react";import { observer } from "mobx-react-lite";import { Combobox } from "@headlessui/react";import { usePopper } from "react-popper";@@ -44,6 +44,7 @@ export const WorkspaceMemberDropdown: React.FC<MemberDropdownProps> = observer((const [isOpen, setIsOpen] = useState<boolean>(false);// refsconst dropdownRef = useRef<HTMLDivElement | null>(null);+ const inputRef = useRef<HTMLInputElement | null>(null);// popper-js refsconst [referenceElement, setReferenceElement] = useState<HTMLButtonElement | null>(null);const [popperElement, setPopperElement] = useState<HTMLDivElement | null>(null);@@ -91,19 +92,13 @@ export const WorkspaceMemberDropdown: React.FC<MemberDropdownProps> = observer((};if (multiple) comboboxProps.multiple = true;- const onOpen = () => {- if (referenceElement) referenceElement.focus();- };-const handleClose = () => {if (!isOpen) return;setIsOpen(false);- if (referenceElement) referenceElement.blur();onClose && onClose();};const toggleDropdown = () => {- if (!isOpen) onOpen();setIsOpen((prevIsOpen) => !prevIsOpen);};@@ -122,6 +117,12 @@ export const WorkspaceMemberDropdown: React.FC<MemberDropdownProps> = observer((useOutsideClickDetector(dropdownRef, handleClose);+ useEffect(() => {+ if (isOpen && inputRef.current) {+ inputRef.current.focus();+ }+ }, [isOpen]);+return (<Comboboxas="div"@@ -192,6 +193,8 @@ export const WorkspaceMemberDropdown: React.FC<MemberDropdownProps> = observer((<div className="flex items-center gap-1.5 rounded border border-custom-border-100 bg-custom-background-90 px-2"><Search className="h-3.5 w-3.5 text-custom-text-400" strokeWidth={1.5} /><Combobox.Input+ as="input"+ ref={inputRef}className="w-full bg-transparent py-1 text-xs text-custom-text-200 placeholder:text-custom-text-400 focus:outline-none"value={query}onChange={(e) => setQuery(e.target.value)}diff --git a/web/components/dropdowns/module.tsx b/web/components/dropdowns/module.tsxindex a9b64c1f1f..c05eeb97e6 100644--- a/web/components/dropdowns/module.tsx+++ b/web/components/dropdowns/module.tsx@@ -166,6 +166,7 @@ export const ModuleDropdown: React.FC<Props> = observer((props) => {const [isOpen, setIsOpen] = useState(false);// refsconst dropdownRef = useRef<HTMLDivElement | null>(null);+ const inputRef = useRef<HTMLInputElement | null>(null);// popper-js refsconst [referenceElement, setReferenceElement] = useState<HTMLButtonElement | null>(null);const [popperElement, setPopperElement] = useState<HTMLDivElement | null>(null);@@ -216,21 +217,13 @@ export const ModuleDropdown: React.FC<Props> = observer((props) => {const filteredOptions =query === "" ? options : options?.filter((o) => o.query.toLowerCase().includes(query.toLowerCase()));- // fetch modules of the project if not already present in the store- useEffect(() => {- if (!workspaceSlug) return;-- if (!moduleIds) fetchModules(workspaceSlug, projectId);- }, [moduleIds, fetchModules, projectId, workspaceSlug]);-const onOpen = () => {- if (referenceElement) referenceElement.focus();+ if (!moduleIds && workspaceSlug) fetchModules(workspaceSlug, projectId);};const handleClose = () => {if (!isOpen) return;setIsOpen(false);- if (referenceElement) referenceElement.blur();onClose && onClose();};@@ -261,6 +254,12 @@ export const ModuleDropdown: React.FC<Props> = observer((props) => {};if (multiple) comboboxProps.multiple = true;+ useEffect(() => {+ if (isOpen && inputRef.current) {+ inputRef.current.focus();+ }+ }, [isOpen]);+return (<Comboboxas="div"@@ -331,6 +330,8 @@ export const ModuleDropdown: React.FC<Props> = observer((props) => {<div className="flex items-center gap-1.5 rounded border border-custom-border-100 bg-custom-background-90 px-2"><Search className="h-3.5 w-3.5 text-custom-text-400" strokeWidth={1.5} /><Combobox.Input+ as="input"+ ref={inputRef}className="w-full bg-transparent py-1 text-xs text-custom-text-200 placeholder:text-custom-text-400 focus:outline-none"value={query}onChange={(e) => setQuery(e.target.value)}diff --git a/web/components/dropdowns/priority.tsx b/web/components/dropdowns/priority.tsxindex 1bab9a21e9..d519ad9f18 100644--- a/web/components/dropdowns/priority.tsx+++ b/web/components/dropdowns/priority.tsx@@ -1,4 +1,4 @@-import { Fragment, ReactNode, useRef, useState } from "react";+import { Fragment, ReactNode, useEffect, useRef, useState } from "react";import { Combobox } from "@headlessui/react";import { usePopper } from "react-popper";import { Check, ChevronDown, Search } from "lucide-react";@@ -272,6 +272,7 @@ export const PriorityDropdown: React.FC<Props> = (props) => {const [isOpen, setIsOpen] = useState(false);// refsconst dropdownRef = useRef<HTMLDivElement | null>(null);+ const inputRef = useRef<HTMLInputElement | null>(null);// popper-js refsconst [referenceElement, setReferenceElement] = useState<HTMLButtonElement | null>(null);const [popperElement, setPopperElement] = useState<HTMLDivElement | null>(null);@@ -305,19 +306,13 @@ export const PriorityDropdown: React.FC<Props> = (props) => {const filteredOptions =query === "" ? options : options.filter((o) => o.query.toLowerCase().includes(query.toLowerCase()));- const onOpen = () => {- if (referenceElement) referenceElement.focus();- };-const handleClose = () => {if (!isOpen) return;setIsOpen(false);- if (referenceElement) referenceElement.blur();onClose && onClose();};const toggleDropdown = () => {- if (!isOpen) onOpen();setIsOpen((prevIsOpen) => !prevIsOpen);};@@ -342,6 +337,12 @@ export const PriorityDropdown: React.FC<Props> = (props) => {? BackgroundButton: TransparentButton;+ useEffect(() => {+ if (isOpen && inputRef.current) {+ inputRef.current.focus();+ }+ }, [isOpen]);+return (<Comboboxas="div"@@ -409,6 +410,8 @@ export const PriorityDropdown: React.FC<Props> = (props) => {<div className="flex items-center gap-1.5 rounded border border-custom-border-100 bg-custom-background-90 px-2"><Search className="h-3.5 w-3.5 text-custom-text-400" strokeWidth={1.5} /><Combobox.Input+ as="input"+ ref={inputRef}className="w-full bg-transparent py-1 text-xs text-custom-text-200 placeholder:text-custom-text-400 focus:outline-none"value={query}onChange={(e) => setQuery(e.target.value)}diff --git a/web/components/dropdowns/project.tsx b/web/components/dropdowns/project.tsxindex 7991c44024..f6fb9205e8 100644--- a/web/components/dropdowns/project.tsx+++ b/web/components/dropdowns/project.tsx@@ -1,4 +1,4 @@-import { Fragment, ReactNode, useRef, useState } from "react";+import { Fragment, ReactNode, useEffect, useRef, useState } from "react";import { observer } from "mobx-react-lite";import { Combobox } from "@headlessui/react";import { usePopper } from "react-popper";@@ -50,6 +50,7 @@ export const ProjectDropdown: React.FC<Props> = observer((props) => {const [isOpen, setIsOpen] = useState(false);// refsconst dropdownRef = useRef<HTMLDivElement | null>(null);+ const inputRef = useRef<HTMLInputElement | null>(null);// popper-js refsconst [referenceElement, setReferenceElement] = useState<HTMLButtonElement | null>(null);const [popperElement, setPopperElement] = useState<HTMLDivElement | null>(null);@@ -94,19 +95,13 @@ export const ProjectDropdown: React.FC<Props> = observer((props) => {const selectedProject = value ? getProjectById(value) : null;- const onOpen = () => {- if (referenceElement) referenceElement.focus();- };-const handleClose = () => {if (!isOpen) return;setIsOpen(false);onClose && onClose();- if (referenceElement) referenceElement.blur();};const toggleDropdown = () => {- if (!isOpen) onOpen();setIsOpen((prevIsOpen) => !prevIsOpen);};@@ -125,6 +120,12 @@ export const ProjectDropdown: React.FC<Props> = observer((props) => {useOutsideClickDetector(dropdownRef, handleClose);+ useEffect(() => {+ if (isOpen && inputRef.current) {+ inputRef.current.focus();+ }+ }, [isOpen]);+return (<Comboboxas="div"@@ -198,6 +199,8 @@ export const ProjectDropdown: React.FC<Props> = observer((props) => {<div className="flex items-center gap-1.5 rounded border border-custom-border-100 bg-custom-background-90 px-2"><Search className="h-3.5 w-3.5 text-custom-text-400" strokeWidth={1.5} /><Combobox.Input+ as="input"+ ref={inputRef}className="w-full bg-transparent py-1 text-xs text-custom-text-200 placeholder:text-custom-text-400 focus:outline-none"value={query}onChange={(e) => setQuery(e.target.value)}diff --git a/web/components/dropdowns/state.tsx b/web/components/dropdowns/state.tsxindex a7f54adfbe..fa068fdd01 100644--- a/web/components/dropdowns/state.tsx+++ b/web/components/dropdowns/state.tsx@@ -1,4 +1,4 @@-import { Fragment, ReactNode, useRef, useState } from "react";+import { Fragment, ReactNode, useEffect, useRef, useState } from "react";import { observer } from "mobx-react-lite";import { Combobox } from "@headlessui/react";import { usePopper } from "react-popper";@@ -52,6 +52,7 @@ export const StateDropdown: React.FC<Props> = observer((props) => {const [isOpen, setIsOpen] = useState(false);// refsconst dropdownRef = useRef<HTMLDivElement | null>(null);+ const inputRef = useRef<HTMLInputElement | null>(null);// popper-js refsconst [referenceElement, setReferenceElement] = useState<HTMLButtonElement | null>(null);const [popperElement, setPopperElement] = useState<HTMLDivElement | null>(null);@@ -92,14 +93,12 @@ export const StateDropdown: React.FC<Props> = observer((props) => {const onOpen = () => {if (!statesList && workspaceSlug) fetchProjectStates(workspaceSlug, projectId);- if (referenceElement) referenceElement.focus();};const handleClose = () => {if (!isOpen) return;setIsOpen(false);onClose && onClose();- if (referenceElement) referenceElement.blur();};const toggleDropdown = () => {@@ -122,6 +121,12 @@ export const StateDropdown: React.FC<Props> = observer((props) => {useOutsideClickDetector(dropdownRef, handleClose);+ useEffect(() => {+ if (isOpen && inputRef.current) {+ inputRef.current.focus();+ }+ }, [isOpen]);+return (<Comboboxas="div"@@ -193,6 +198,8 @@ export const StateDropdown: React.FC<Props> = observer((props) => {<div className="flex items-center gap-1.5 rounded border border-custom-border-100 bg-custom-background-90 px-2"><Search className="h-3.5 w-3.5 text-custom-text-400" strokeWidth={1.5} /><Combobox.Input+ as="input"+ ref={inputRef}className="w-full bg-transparent py-1 text-xs text-custom-text-200 placeholder:text-custom-text-400 focus:outline-none"value={query}onChange={(e) => setQuery(e.target.value)}diff --git a/web/components/issues/peek-overview/view.tsx b/web/components/issues/peek-overview/view.tsxindex 82bda41d5f..7b6c851ffd 100644--- a/web/components/issues/peek-overview/view.tsx+++ b/web/components/issues/peek-overview/view.tsx@@ -126,7 +126,7 @@ export const IssueView: FC<IIssueView> = observer((props) => {/>)}- <div className="w-full truncate !text-base">+ <div className="w-full !text-base">{issueId && (<divref={issuePeekOverviewRef}@@ -230,11 +230,7 @@ export const IssueView: FC<IIssueView> = observer((props) => {disabled={disabled}/>- <IssueActivity- workspaceSlug={workspaceSlug}- projectId={projectId}- issueId={issueId}- />+ <IssueActivity workspaceSlug={workspaceSlug} projectId={projectId} issueId={issueId} /></div>) : (<div className={`flex h-full w-full overflow-auto`}>@@ -250,11 +246,7 @@ export const IssueView: FC<IIssueView> = observer((props) => {setIsSubmitting={(value) => setIsSubmitting(value)}/>- <IssueActivity- workspaceSlug={workspaceSlug}- projectId={projectId}- issueId={issueId}- />+ <IssueActivity workspaceSlug={workspaceSlug} projectId={projectId} issueId={issueId} /></div></div><divdiff --git a/web/components/issues/select/label.tsx b/web/components/issues/select/label.tsxindex 73fddfa9d1..754edf0bd0 100644--- a/web/components/issues/select/label.tsx+++ b/web/components/issues/select/label.tsx@@ -1,4 +1,4 @@-import React, { Fragment, useRef, useState } from "react";+import React, { Fragment, useEffect, useRef, useState } from "react";import { useRouter } from "next/router";import { Combobox } from "@headlessui/react";import { usePopper } from "react-popper";@@ -36,6 +36,7 @@ export const IssueLabelSelect: React.FC<Props> = observer((props) => {const [isDropdownOpen, setIsDropdownOpen] = useState(false);// refsconst dropdownRef = useRef<HTMLDivElement | null>(null);+ const inputRef = useRef<HTMLInputElement | null>(null);// popperconst { styles, attributes } = usePopper(referenceElement, popperElement, {placement: "bottom-start",@@ -76,6 +77,12 @@ export const IssueLabelSelect: React.FC<Props> = observer((props) => {useOutsideClickDetector(dropdownRef, handleClose);+ useEffect(() => {+ if (isDropdownOpen && inputRef.current) {+ inputRef.current.focus();+ }+ }, [isDropdownOpen]);+return (<Comboboxas="div"@@ -125,6 +132,8 @@ export const IssueLabelSelect: React.FC<Props> = observer((props) => {<div className="flex items-center gap-1.5 rounded border border-custom-border-100 bg-custom-background-90 px-2"><Search className="h-3.5 w-3.5 text-custom-text-400" strokeWidth={1.5} /><Combobox.Input+ as="input"+ ref={inputRef}className="w-full bg-transparent py-1 text-xs text-custom-text-200 placeholder:text-custom-text-400 focus:outline-none"onChange={(event) => setQuery(event.target.value)}placeholder="Search"