-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor: keyboard shortcuts modal (#2822)
* refactor: keyboard shortcuts modal * chore: updated search logic * refactor: divided the modal component into granular components
- Loading branch information
Showing
7 changed files
with
208 additions
and
201 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
export * from "./actions"; | ||
export * from "./shortcuts-modal"; | ||
export * from "./command-modal"; | ||
export * from "./command-pallette"; | ||
export * from "./helpers"; | ||
export * from "./shortcuts-modal"; |
This file was deleted.
Oops, something went wrong.
98 changes: 98 additions & 0 deletions
98
web/components/command-palette/shortcuts-modal/commands-list.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,98 @@ | ||
import { Command } from "lucide-react"; | ||
// helpers | ||
import { substringMatch } from "helpers/string.helper"; | ||
|
||
type Props = { | ||
searchQuery: string; | ||
}; | ||
|
||
const KEYBOARD_SHORTCUTS = [ | ||
{ | ||
key: "navigation", | ||
title: "Navigation", | ||
shortcuts: [{ keys: "Ctrl,K", description: "Open command menu" }], | ||
}, | ||
{ | ||
key: "common", | ||
title: "Common", | ||
shortcuts: [ | ||
{ keys: "P", description: "Create project" }, | ||
{ keys: "C", description: "Create issue" }, | ||
{ keys: "Q", description: "Create cycle" }, | ||
{ keys: "M", description: "Create module" }, | ||
{ keys: "V", description: "Create view" }, | ||
{ keys: "D", description: "Create page" }, | ||
{ keys: "Delete", description: "Bulk delete issues" }, | ||
{ keys: "H", description: "Open shortcuts guide" }, | ||
{ | ||
keys: "Ctrl,Alt,C", | ||
description: "Copy issue URL from the issue details page", | ||
}, | ||
], | ||
}, | ||
]; | ||
|
||
export const ShortcutCommandsList: React.FC<Props> = (props) => { | ||
const { searchQuery } = props; | ||
|
||
const filteredShortcuts = KEYBOARD_SHORTCUTS.map((category) => { | ||
const newCategory = { ...category }; | ||
|
||
newCategory.shortcuts = newCategory.shortcuts.filter((shortcut) => | ||
substringMatch(shortcut.description, searchQuery) | ||
); | ||
|
||
return newCategory; | ||
}); | ||
|
||
const isShortcutsEmpty = filteredShortcuts.every((category) => category.shortcuts.length === 0); | ||
|
||
return ( | ||
<div className="flex flex-col gap-y-3 overflow-y-auto"> | ||
{!isShortcutsEmpty ? ( | ||
filteredShortcuts.map((category) => { | ||
if (category.shortcuts.length === 0) return; | ||
|
||
return ( | ||
<div key={category.key}> | ||
<h5 className="text-left text-sm font-medium">{category.title}</h5> | ||
<div className="space-y-3 px-1"> | ||
{category.shortcuts.map((shortcut) => ( | ||
<div key={shortcut.keys} className="mt-1"> | ||
<div className="flex items-center justify-between"> | ||
<h4 className="text-xs text-custom-text-200">{shortcut.description}</h4> | ||
<div className="flex items-center gap-x-1.5"> | ||
{shortcut.keys.split(",").map((key) => ( | ||
<div key={key} className="flex items-center gap-1"> | ||
{key === "Ctrl" ? ( | ||
<div className="grid place-items-center rounded-sm border-[0.5px] border-custom-border-200 bg-custom-background-90 h-6 min-w-[1.5rem] px-1.5"> | ||
<Command className="h-2.5 w-2.5 text-custom-text-200" /> | ||
</div> | ||
) : ( | ||
<kbd className="grid place-items-center rounded-sm border-[0.5px] border-custom-border-200 bg-custom-background-90 h-6 min-w-[1.5rem] px-1.5 text-[10px] text-custom-text-200"> | ||
{key} | ||
</kbd> | ||
)} | ||
</div> | ||
))} | ||
</div> | ||
</div> | ||
</div> | ||
))} | ||
</div> | ||
</div> | ||
); | ||
}) | ||
) : ( | ||
<p className="flex justify-center text-center text-sm text-custom-text-200"> | ||
No shortcuts found for{" "} | ||
<span className="font-semibold italic"> | ||
{`"`} | ||
{searchQuery} | ||
{`"`} | ||
</span> | ||
</p> | ||
)} | ||
</div> | ||
); | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
export * from "./commands-list"; | ||
export * from "./modal"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,81 @@ | ||
import { FC, useState, Fragment } from "react"; | ||
import { Dialog, Transition } from "@headlessui/react"; | ||
import { Search, X } from "lucide-react"; | ||
// components | ||
import { ShortcutCommandsList } from "components/command-palette"; | ||
// ui | ||
import { Input } from "@plane/ui"; | ||
|
||
type Props = { | ||
isOpen: boolean; | ||
onClose: () => void; | ||
}; | ||
|
||
export const ShortcutsModal: FC<Props> = (props) => { | ||
const { isOpen, onClose } = props; | ||
// states | ||
const [query, setQuery] = useState(""); | ||
|
||
const handleClose = () => { | ||
onClose(); | ||
setQuery(""); | ||
}; | ||
|
||
return ( | ||
<Transition.Root show={isOpen} as={Fragment}> | ||
<Dialog as="div" className="relative z-20" onClose={handleClose}> | ||
<Transition.Child | ||
as={Fragment} | ||
enter="ease-out duration-300" | ||
enterFrom="opacity-0" | ||
enterTo="opacity-100" | ||
leave="ease-in duration-200" | ||
leaveFrom="opacity-100" | ||
leaveTo="opacity-0" | ||
> | ||
<div className="fixed inset-0 bg-custom-backdrop transition-opacity" /> | ||
</Transition.Child> | ||
|
||
<div className="fixed h-full w-full inset-0 z-20 overflow-y-auto"> | ||
<Transition.Child | ||
as={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="h-full w-full"> | ||
<div className="h-full w-full grid place-items-center p-5"> | ||
<div className="flex flex-col rounded-lg bg-custom-background-100 shadow-custom-shadow-md transition-all p-5 space-y-4 h-[61vh] w-full sm:w-[28rem] overflow-hidden"> | ||
<Dialog.Title as="h3" className="flex justify-between"> | ||
<span className="text-lg font-medium">Keyboard shortcuts</span> | ||
<button type="button" onClick={handleClose}> | ||
<X className="h-4 w-4 text-custom-text-200 hover:text-custom-text-100" aria-hidden="true" /> | ||
</button> | ||
</Dialog.Title> | ||
<div className="flex w-full items-center rounded border-[0.5px] border-custom-border-200 bg-custom-background-90 px-2"> | ||
<Search className="h-3.5 w-3.5 text-custom-text-200" /> | ||
<Input | ||
id="search" | ||
name="search" | ||
type="text" | ||
value={query} | ||
onChange={(e) => setQuery(e.target.value)} | ||
placeholder="Search for shortcuts" | ||
className="w-full border-none bg-transparent py-1 text-xs text-custom-text-200 outline-none" | ||
autoFocus | ||
tabIndex={1} | ||
/> | ||
</div> | ||
<ShortcutCommandsList searchQuery={query} /> | ||
</div> | ||
</div> | ||
</Dialog.Panel> | ||
</Transition.Child> | ||
</div> | ||
</Dialog> | ||
</Transition.Root> | ||
); | ||
}; |
File renamed without changes.
Oops, something went wrong.
10c52bf
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Successfully deployed to the following URLs:
plane-dev – ./web/
plane-dev-git-develop-plane.vercel.app
plane-dev-plane.vercel.app
plane-dev.vercel.app
crew42.plane.so