Skip to content

armgit / plane

Public Imported from GitHub
0

πŸ”₯πŸ”₯πŸ”₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.

[WEB-127] fix: issue with command palette outside click detection. (#3812)

Prateek Shourya7e46cbcb52d6
diff --git a/web/components/command-palette/command-modal.tsx b/web/components/command-palette/command-modal.tsx
index bd489f4c4c..b52976aa8c 100644
--- a/web/components/command-palette/command-modal.tsx
+++ b/web/components/command-palette/command-modal.tsx
@@ -154,237 +154,239 @@ export const CommandModal: React.FC = observer(() => {
<div className="fixed inset-0 bg-custom-backdrop transition-opacity" />
</Transition.Child>
- <div className="fixed inset-0 z-30 overflow-y-auto p-4 sm:p-6 md:p-20">
- <Transition.Child
- as={React.Fragment}
- enter="ease-out duration-300"
- enterFrom="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
- enterTo="opacity-100 translate-y-0 sm:scale-100"
- leave="ease-in duration-200"
- leaveFrom="opacity-100 translate-y-0 sm:scale-100"
- leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
- >
- <Dialog.Panel className="relative flex w-full items-center justify-center ">
- <div className="w-full max-w-2xl transform divide-y divide-custom-border-200 divide-opacity-10 rounded-lg bg-custom-background-100 shadow-custom-shadow-md transition-all">
- <Command
- filter={(value, search) => {
- if (value.toLowerCase().includes(search.toLowerCase())) return 1;
- return 0;
- }}
- onKeyDown={(e) => {
- // when search is empty and page is undefined
- // when user tries to close the modal with esc
- if (e.key === "Escape" && !page && !searchTerm) closePalette();
+ <div className="fixed inset-0 z-30 overflow-y-auto">
+ <div className="flex items-center justify-center p-4 sm:p-6 md:p-20">
+ <Transition.Child
+ as={React.Fragment}
+ enter="ease-out duration-300"
+ enterFrom="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
+ enterTo="opacity-100 translate-y-0 sm:scale-100"
+ leave="ease-in duration-200"
+ leaveFrom="opacity-100 translate-y-0 sm:scale-100"
+ leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
+ >
+ <Dialog.Panel className="relative flex w-full max-w-2xl items-center justify-center transform divide-y divide-custom-border-200 divide-opacity-10 rounded-lg bg-custom-background-100 shadow-custom-shadow-md transition-all">
+ <div className="w-full max-w-2xl">
+ <Command
+ filter={(value, search) => {
+ if (value.toLowerCase().includes(search.toLowerCase())) return 1;
+ return 0;
+ }}
+ onKeyDown={(e) => {
+ // when search is empty and page is undefined
+ // when user tries to close the modal with esc
+ if (e.key === "Escape" && !page && !searchTerm) closePalette();
- // Escape goes to previous page
- // Backspace goes to previous page when search is empty
- if (e.key === "Escape" || (e.key === "Backspace" && !searchTerm)) {
- e.preventDefault();
- setPages((pages) => pages.slice(0, -1));
- setPlaceholder("Type a command or search...");
- }
- }}
- >
- <div
- className={`flex gap-4 p-3 pb-0 sm:items-center ${
- issueDetails ? "flex-col justify-between sm:flex-row" : "justify-end"
- }`}
+ // Escape goes to previous page
+ // Backspace goes to previous page when search is empty
+ if (e.key === "Escape" || (e.key === "Backspace" && !searchTerm)) {
+ e.preventDefault();
+ setPages((pages) => pages.slice(0, -1));
+ setPlaceholder("Type a command or search...");
+ }
+ }}
>
- {issueDetails && (
- <div className="overflow-hidden truncate rounded-md bg-custom-background-80 p-2 text-xs font-medium text-custom-text-200">
- {projectDetails?.identifier}-{issueDetails.sequence_id} {issueDetails.name}
- </div>
- )}
- {projectId && (
- <Tooltip tooltipContent="Toggle workspace level search">
- <div className="flex flex-shrink-0 cursor-pointer items-center gap-1 self-end text-xs sm:self-center">
- <button
- type="button"
- onClick={() => setIsWorkspaceLevel((prevData) => !prevData)}
- className="flex-shrink-0"
- >
- Workspace Level
- </button>
- <ToggleSwitch
- value={isWorkspaceLevel}
- onChange={() => setIsWorkspaceLevel((prevData) => !prevData)}
- />
+ <div
+ className={`flex gap-4 p-3 pb-0 sm:items-center ${
+ issueDetails ? "flex-col justify-between sm:flex-row" : "justify-end"
+ }`}
+ >
+ {issueDetails && (
+ <div className="overflow-hidden truncate rounded-md bg-custom-background-80 p-2 text-xs font-medium text-custom-text-200">
+ {projectDetails?.identifier}-{issueDetails.sequence_id} {issueDetails.name}
</div>
- </Tooltip>
- )}
- </div>
- <div className="relative">
- <Search
- className="pointer-events-none absolute left-4 top-1/2 h-4 w-4 -translate-y-1/2 text-custom-text-200"
- aria-hidden="true"
- strokeWidth={2}
- />
- <Command.Input
- className="w-full border-0 border-b border-custom-border-200 bg-transparent p-4 pl-11 text-sm text-custom-text-100 outline-none placeholder:text-custom-text-400 focus:ring-0"
- placeholder={placeholder}
- value={searchTerm}
- onValueChange={(e) => setSearchTerm(e)}
- autoFocus
- tabIndex={1}
- />
- </div>
-
- <Command.List className="max-h-96 overflow-scroll p-2 vertical-scrollbar scrollbar-sm">
- {searchTerm !== "" && (
- <h5 className="mx-[3px] my-4 text-xs text-custom-text-100">
- Search results for{" "}
- <span className="font-medium">
- {'"'}
- {searchTerm}
- {'"'}
- </span>{" "}
- in {!projectId || isWorkspaceLevel ? "workspace" : "project"}:
- </h5>
- )}
+ )}
+ {projectId && (
+ <Tooltip tooltipContent="Toggle workspace level search">
+ <div className="flex flex-shrink-0 cursor-pointer items-center gap-1 self-end text-xs sm:self-center">
+ <button
+ type="button"
+ onClick={() => setIsWorkspaceLevel((prevData) => !prevData)}
+ className="flex-shrink-0"
+ >
+ Workspace Level
+ </button>
+ <ToggleSwitch
+ value={isWorkspaceLevel}
+ onChange={() => setIsWorkspaceLevel((prevData) => !prevData)}
+ />
+ </div>
+ </Tooltip>
+ )}
+ </div>
+ <div className="relative">
+ <Search
+ className="pointer-events-none absolute left-4 top-1/2 h-4 w-4 -translate-y-1/2 text-custom-text-200"
+ aria-hidden="true"
+ strokeWidth={2}
+ />
+ <Command.Input
+ className="w-full border-0 border-b border-custom-border-200 bg-transparent p-4 pl-11 text-sm text-custom-text-100 outline-none placeholder:text-custom-text-400 focus:ring-0"
+ placeholder={placeholder}
+ value={searchTerm}
+ onValueChange={(e) => setSearchTerm(e)}
+ autoFocus
+ tabIndex={1}
+ />
+ </div>
- {!isLoading && resultsCount === 0 && searchTerm !== "" && debouncedSearchTerm !== "" && (
- <div className="my-4 text-center text-sm text-custom-text-200">No results found.</div>
- )}
+ <Command.List className="max-h-96 overflow-scroll p-2 vertical-scrollbar scrollbar-sm">
+ {searchTerm !== "" && (
+ <h5 className="mx-[3px] my-4 text-xs text-custom-text-100">
+ Search results for{" "}
+ <span className="font-medium">
+ {'"'}
+ {searchTerm}
+ {'"'}
+ </span>{" "}
+ in {!projectId || isWorkspaceLevel ? "workspace" : "project"}:
+ </h5>
+ )}
- {(isLoading || isSearching) && (
- <Command.Loading>
- <Loader className="space-y-3">
- <Loader.Item height="40px" />
- <Loader.Item height="40px" />
- <Loader.Item height="40px" />
- <Loader.Item height="40px" />
- </Loader>
- </Command.Loading>
- )}
+ {!isLoading && resultsCount === 0 && searchTerm !== "" && debouncedSearchTerm !== "" && (
+ <div className="my-4 text-center text-sm text-custom-text-200">No results found.</div>
+ )}
- {debouncedSearchTerm !== "" && (
- <CommandPaletteSearchResults closePalette={closePalette} results={results} />
- )}
+ {(isLoading || isSearching) && (
+ <Command.Loading>
+ <Loader className="space-y-3">
+ <Loader.Item height="40px" />
+ <Loader.Item height="40px" />
+ <Loader.Item height="40px" />
+ <Loader.Item height="40px" />
+ </Loader>
+ </Command.Loading>
+ )}
- {!page && (
- <>
- {/* issue actions */}
- {issueId && (
- <CommandPaletteIssueActions
- closePalette={closePalette}
- issueDetails={issueDetails}
- pages={pages}
- setPages={(newPages) => setPages(newPages)}
- setPlaceholder={(newPlaceholder) => setPlaceholder(newPlaceholder)}
- setSearchTerm={(newSearchTerm) => setSearchTerm(newSearchTerm)}
- />
- )}
- <Command.Group heading="Issue">
- <Command.Item
- onSelect={() => {
- closePalette();
- setTrackElement("Command Palette");
- toggleCreateIssueModal(true);
- }}
- className="focus:bg-custom-background-80"
- >
- <div className="flex items-center gap-2 text-custom-text-200">
- <LayersIcon className="h-3.5 w-3.5" />
- Create new issue
- </div>
- <kbd>C</kbd>
- </Command.Item>
- </Command.Group>
+ {debouncedSearchTerm !== "" && (
+ <CommandPaletteSearchResults closePalette={closePalette} results={results} />
+ )}
- {workspaceSlug && (
- <Command.Group heading="Project">
+ {!page && (
+ <>
+ {/* issue actions */}
+ {issueId && (
+ <CommandPaletteIssueActions
+ closePalette={closePalette}
+ issueDetails={issueDetails}
+ pages={pages}
+ setPages={(newPages) => setPages(newPages)}
+ setPlaceholder={(newPlaceholder) => setPlaceholder(newPlaceholder)}
+ setSearchTerm={(newSearchTerm) => setSearchTerm(newSearchTerm)}
+ />
+ )}
+ <Command.Group heading="Issue">
<Command.Item
onSelect={() => {
closePalette();
- setTrackElement("Command palette");
- toggleCreateProjectModal(true);
+ setTrackElement("Command Palette");
+ toggleCreateIssueModal(true);
}}
- className="focus:outline-none"
+ className="focus:bg-custom-background-80"
>
<div className="flex items-center gap-2 text-custom-text-200">
- <FolderPlus className="h-3.5 w-3.5" />
- Create new project
+ <LayersIcon className="h-3.5 w-3.5" />
+ Create new issue
</div>
- <kbd>P</kbd>
+ <kbd>C</kbd>
</Command.Item>
</Command.Group>
- )}
- {/* project actions */}
- {projectId && <CommandPaletteProjectActions closePalette={closePalette} />}
+ {workspaceSlug && (
+ <Command.Group heading="Project">
+ <Command.Item
+ onSelect={() => {
+ closePalette();
+ setTrackElement("Command palette");
+ toggleCreateProjectModal(true);
+ }}
+ className="focus:outline-none"
+ >
+ <div className="flex items-center gap-2 text-custom-text-200">
+ <FolderPlus className="h-3.5 w-3.5" />
+ Create new project
+ </div>
+ <kbd>P</kbd>
+ </Command.Item>
+ </Command.Group>
+ )}
- <Command.Group heading="Workspace Settings">
- <Command.Item
- onSelect={() => {
- setPlaceholder("Search workspace settings...");
- setSearchTerm("");
- setPages([...pages, "settings"]);
- }}
- className="focus:outline-none"
- >
- <div className="flex items-center gap-2 text-custom-text-200">
- <Settings className="h-3.5 w-3.5" />
- Search settings...
- </div>
- </Command.Item>
- </Command.Group>
- <Command.Group heading="Account">
- <Command.Item onSelect={createNewWorkspace} className="focus:outline-none">
- <div className="flex items-center gap-2 text-custom-text-200">
- <FolderPlus className="h-3.5 w-3.5" />
- Create new workspace
- </div>
- </Command.Item>
- <Command.Item
- onSelect={() => {
- setPlaceholder("Change interface theme...");
- setSearchTerm("");
- setPages([...pages, "change-interface-theme"]);
- }}
- className="focus:outline-none"
- >
- <div className="flex items-center gap-2 text-custom-text-200">
- <Settings className="h-3.5 w-3.5" />
- Change interface theme...
- </div>
- </Command.Item>
- </Command.Group>
+ {/* project actions */}
+ {projectId && <CommandPaletteProjectActions closePalette={closePalette} />}
+
+ <Command.Group heading="Workspace Settings">
+ <Command.Item
+ onSelect={() => {
+ setPlaceholder("Search workspace settings...");
+ setSearchTerm("");
+ setPages([...pages, "settings"]);
+ }}
+ className="focus:outline-none"
+ >
+ <div className="flex items-center gap-2 text-custom-text-200">
+ <Settings className="h-3.5 w-3.5" />
+ Search settings...
+ </div>
+ </Command.Item>
+ </Command.Group>
+ <Command.Group heading="Account">
+ <Command.Item onSelect={createNewWorkspace} className="focus:outline-none">
+ <div className="flex items-center gap-2 text-custom-text-200">
+ <FolderPlus className="h-3.5 w-3.5" />
+ Create new workspace
+ </div>
+ </Command.Item>
+ <Command.Item
+ onSelect={() => {
+ setPlaceholder("Change interface theme...");
+ setSearchTerm("");
+ setPages([...pages, "change-interface-theme"]);
+ }}
+ className="focus:outline-none"
+ >
+ <div className="flex items-center gap-2 text-custom-text-200">
+ <Settings className="h-3.5 w-3.5" />
+ Change interface theme...
+ </div>
+ </Command.Item>
+ </Command.Group>
- {/* help options */}
- <CommandPaletteHelpActions closePalette={closePalette} />
- </>
- )}
+ {/* help options */}
+ <CommandPaletteHelpActions closePalette={closePalette} />
+ </>
+ )}
- {/* workspace settings actions */}
- {page === "settings" && workspaceSlug && (
- <CommandPaletteWorkspaceSettingsActions closePalette={closePalette} />
- )}
+ {/* workspace settings actions */}
+ {page === "settings" && workspaceSlug && (
+ <CommandPaletteWorkspaceSettingsActions closePalette={closePalette} />
+ )}
- {/* issue details page actions */}
- {page === "change-issue-state" && issueDetails && (
- <ChangeIssueState closePalette={closePalette} issue={issueDetails} />
- )}
- {page === "change-issue-priority" && issueDetails && (
- <ChangeIssuePriority closePalette={closePalette} issue={issueDetails} />
- )}
- {page === "change-issue-assignee" && issueDetails && (
- <ChangeIssueAssignee closePalette={closePalette} issue={issueDetails} />
- )}
+ {/* issue details page actions */}
+ {page === "change-issue-state" && issueDetails && (
+ <ChangeIssueState closePalette={closePalette} issue={issueDetails} />
+ )}
+ {page === "change-issue-priority" && issueDetails && (
+ <ChangeIssuePriority closePalette={closePalette} issue={issueDetails} />
+ )}
+ {page === "change-issue-assignee" && issueDetails && (
+ <ChangeIssueAssignee closePalette={closePalette} issue={issueDetails} />
+ )}
- {/* theme actions */}
- {page === "change-interface-theme" && (
- <CommandPaletteThemeActions
- closePalette={() => {
- closePalette();
- setPages((pages) => pages.slice(0, -1));
- }}
- />
- )}
- </Command.List>
- </Command>
- </div>
- </Dialog.Panel>
- </Transition.Child>
+ {/* theme actions */}
+ {page === "change-interface-theme" && (
+ <CommandPaletteThemeActions
+ closePalette={() => {
+ closePalette();
+ setPages((pages) => pages.slice(0, -1));
+ }}
+ />
+ )}
+ </Command.List>
+ </Command>
+ </div>
+ </Dialog.Panel>
+ </Transition.Child>
+ </div>
</div>
</Dialog>
</Transition.Root>