mirror of
https://github.com/makeplane/plane
synced 2024-06-14 14:31:34 +00:00
refactor: keyboard shortcuts modal (#2822)
* refactor: keyboard shortcuts modal * chore: updated search logic * refactor: divided the modal component into granular components
This commit is contained in:
Aaryan Khandelwal
sriram veeraghanta
parent
2e3476ab3c
commit
3a1b722d31
@ -1,5 +1,5 @@
|
|||||||
export * from "./actions";
|
export * from "./actions";
|
||||||
|
export * from "./shortcuts-modal";
|
||||||
export * from "./command-modal";
|
export * from "./command-modal";
|
||||||
export * from "./command-pallette";
|
export * from "./command-pallette";
|
||||||
export * from "./helpers";
|
export * from "./helpers";
|
||||||
export * from "./shortcuts-modal";
|
|
||||||
|
|||||||
@ -1,200 +0,0 @@
|
|||||||
import { FC, useEffect, useState, Fragment } from "react";
|
|
||||||
import { Dialog, Transition } from "@headlessui/react";
|
|
||||||
// icons
|
|
||||||
import { Command, Search, X } from "lucide-react";
|
|
||||||
// ui
|
|
||||||
import { Input } from "@plane/ui";
|
|
||||||
|
|
||||||
type Props = {
|
|
||||||
isOpen: boolean;
|
|
||||||
onClose: () => void;
|
|
||||||
};
|
|
||||||
|
|
||||||
const shortcuts = [
|
|
||||||
{
|
|
||||||
title: "Navigation",
|
|
||||||
shortcuts: [
|
|
||||||
{ keys: "Ctrl,K", description: "To open navigator" },
|
|
||||||
{ keys: "↑", description: "Move up" },
|
|
||||||
{ keys: "↓", description: "Move down" },
|
|
||||||
{ keys: "←", description: "Move left" },
|
|
||||||
{ keys: "→", description: "Move right" },
|
|
||||||
],
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: "Common",
|
|
||||||
shortcuts: [
|
|
||||||
{ keys: "P", description: "To create project" },
|
|
||||||
{ keys: "C", description: "To create issue" },
|
|
||||||
{ keys: "Q", description: "To create cycle" },
|
|
||||||
{ keys: "M", description: "To create module" },
|
|
||||||
{ keys: "V", description: "To create view" },
|
|
||||||
{ keys: "D", description: "To create page" },
|
|
||||||
{ keys: "Delete", description: "To bulk delete issues" },
|
|
||||||
{ keys: "H", description: "To open shortcuts guide" },
|
|
||||||
{
|
|
||||||
keys: "Ctrl,Alt,C",
|
|
||||||
description: "To copy issue url when on issue detail page",
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
];
|
|
||||||
|
|
||||||
const allShortcuts = shortcuts.map((i) => i.shortcuts).flat(1);
|
|
||||||
|
|
||||||
export const ShortcutsModal: FC<Props> = (props) => {
|
|
||||||
const { isOpen, onClose } = props;
|
|
||||||
// states
|
|
||||||
const [query, setQuery] = useState("");
|
|
||||||
// computed
|
|
||||||
const filteredShortcuts = allShortcuts.filter((shortcut) =>
|
|
||||||
shortcut.description.toLowerCase().includes(query.trim().toLowerCase()) || query === "" ? true : false
|
|
||||||
);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (!isOpen) setQuery("");
|
|
||||||
}, [isOpen]);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Transition.Root show={isOpen} as={Fragment}>
|
|
||||||
<Dialog as="div" className="relative z-20" onClose={onClose}>
|
|
||||||
<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 inset-0 z-20 overflow-y-auto">
|
|
||||||
<div className="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0">
|
|
||||||
<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="relative transform overflow-hidden rounded-lg bg-custom-background-100 text-left shadow-custom-shadow-md transition-all sm:my-8 sm:w-full sm:max-w-lg">
|
|
||||||
<div className="bg-custom-background-100 p-5">
|
|
||||||
<div className="sm:flex sm:items-start">
|
|
||||||
<div className="flex w-full flex-col gap-y-4 text-center sm:text-left">
|
|
||||||
<Dialog.Title
|
|
||||||
as="h3"
|
|
||||||
className="flex justify-between text-lg font-medium leading-6 text-custom-text-100"
|
|
||||||
>
|
|
||||||
<span>Keyboard Shortcuts</span>
|
|
||||||
<span>
|
|
||||||
<button type="button" onClick={onClose}>
|
|
||||||
<X className="h-6 w-6 text-custom-text-200 hover:text-custom-text-100" aria-hidden="true" />
|
|
||||||
</button>
|
|
||||||
</span>
|
|
||||||
</Dialog.Title>
|
|
||||||
<div>
|
|
||||||
<div className="flex w-full items-center justify-start gap-1 rounded border-[0.6px] border-custom-border-200 bg-custom-background-90 px-3 py-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 px-2 text-xs text-custom-text-200 focus:outline-none"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className="flex w-full flex-col gap-y-3">
|
|
||||||
{query.trim().length > 0 ? (
|
|
||||||
filteredShortcuts.length > 0 ? (
|
|
||||||
filteredShortcuts.map((shortcut) => (
|
|
||||||
<div key={shortcut.keys} className="flex w-full flex-col">
|
|
||||||
<div className="flex flex-col gap-y-3">
|
|
||||||
<div className="flex items-center justify-between">
|
|
||||||
<p className="text-sm text-custom-text-200">{shortcut.description}</p>
|
|
||||||
<div className="flex items-center gap-x-2.5">
|
|
||||||
{shortcut.keys.split(",").map((key, index) => (
|
|
||||||
<span key={index} className="flex items-center gap-1">
|
|
||||||
{key === "Ctrl" ? (
|
|
||||||
<span className="flex h-full items-center rounded-sm border border-custom-border-200 bg-custom-background-90 p-1.5">
|
|
||||||
<Command className="h-4 w-4 text-custom-text-200" />
|
|
||||||
</span>
|
|
||||||
) : key === "Ctrl" ? (
|
|
||||||
<kbd className="rounded-sm border border-custom-border-200 bg-custom-background-90 p-1.5 text-sm font-medium text-custom-text-200">
|
|
||||||
<Command className="h-4 w-4 text-custom-text-200" />
|
|
||||||
</kbd>
|
|
||||||
) : (
|
|
||||||
<kbd className="rounded-sm border border-custom-border-200 bg-custom-background-90 px-2 py-1 text-sm font-medium text-custom-text-200">
|
|
||||||
{key}
|
|
||||||
</kbd>
|
|
||||||
)}
|
|
||||||
</span>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
))
|
|
||||||
) : (
|
|
||||||
<div className="flex flex-col gap-y-3">
|
|
||||||
<p className="text-sm text-custom-text-200">
|
|
||||||
No shortcuts found for{" "}
|
|
||||||
<span className="font-semibold italic">
|
|
||||||
{`"`}
|
|
||||||
{query}
|
|
||||||
{`"`}
|
|
||||||
</span>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
) : (
|
|
||||||
shortcuts.map(({ title, shortcuts }) => (
|
|
||||||
<div key={title} className="flex w-full flex-col">
|
|
||||||
<p className="mb-4 font-medium">{title}</p>
|
|
||||||
<div className="flex flex-col gap-y-3">
|
|
||||||
{shortcuts.map(({ keys, description }, index) => (
|
|
||||||
<div key={index} className="flex items-center justify-between">
|
|
||||||
<p className="text-sm text-custom-text-200">{description}</p>
|
|
||||||
<div className="flex items-center gap-x-2.5">
|
|
||||||
{keys.split(",").map((key, index) => (
|
|
||||||
<span key={index} className="flex items-center gap-1">
|
|
||||||
{key === "Ctrl" ? (
|
|
||||||
<span className="flex h-full items-center rounded-sm border border-custom-border-200 bg-custom-background-90 p-1.5 text-custom-text-200">
|
|
||||||
<Command className="h-4 w-4 text-custom-text-200" />
|
|
||||||
</span>
|
|
||||||
) : key === "Ctrl" ? (
|
|
||||||
<kbd className="rounded-sm border border-custom-border-200 bg-custom-background-90 p-1.5 text-sm font-medium text-custom-text-200">
|
|
||||||
<Command className="h-4 w-4 text-custom-text-200" />
|
|
||||||
</kbd>
|
|
||||||
) : (
|
|
||||||
<kbd className="rounded-sm border border-custom-border-200 bg-custom-background-90 px-2 py-1 text-sm font-medium text-custom-text-200">
|
|
||||||
{key}
|
|
||||||
</kbd>
|
|
||||||
)}
|
|
||||||
</span>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
))
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</Dialog.Panel>
|
|
||||||
</Transition.Child>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</Dialog>
|
|
||||||
</Transition.Root>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
@ -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>
|
||||||
|
);
|
||||||
|
};
|
||||||
2
web/components/command-palette/shortcuts-modal/index.ts
Normal file
2
web/components/command-palette/shortcuts-modal/index.ts
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
export * from "./commands-list";
|
||||||
|
export * from "./modal";
|
||||||
81
web/components/command-palette/shortcuts-modal/modal.tsx
Normal file
81
web/components/command-palette/shortcuts-modal/modal.tsx
Normal file
@ -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>
|
||||||
|
);
|
||||||
|
};
|
||||||
@ -180,3 +180,29 @@ export const getFetchKeysForIssueMutation = (options: {
|
|||||||
...ganttFetchKey,
|
...ganttFetchKey,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @returns {boolean} true if searchQuery is substring of text in the same order, false otherwise
|
||||||
|
* @description Returns true if searchQuery is substring of text in the same order, false otherwise
|
||||||
|
* @param {string} text string to compare from
|
||||||
|
* @param {string} searchQuery
|
||||||
|
* @example substringMatch("hello world", "hlo") => true
|
||||||
|
* @example substringMatch("hello world", "hoe") => false
|
||||||
|
*/
|
||||||
|
export const substringMatch = (text: string, searchQuery: string): boolean => {
|
||||||
|
try {
|
||||||
|
let searchIndex = 0;
|
||||||
|
|
||||||
|
for (let i = 0; i < text.length; i++) {
|
||||||
|
if (text[i].toLowerCase() === searchQuery[searchIndex]?.toLowerCase()) searchIndex++;
|
||||||
|
|
||||||
|
// All characters of searchQuery found in order
|
||||||
|
if (searchIndex === searchQuery.length) return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Not all characters of searchQuery found in order
|
||||||
|
return false;
|
||||||
|
} catch (error) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user