admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

2294 feat(frontend): styling shortcut keys (#2336)

Browse Source 
* 2294 feat(frontend): styling shortcut keys

* 2294 fix(front): pr requested changes

* Fix component interface

---------

Co-authored-by: Charles Bochet <charles@twenty.com>
This commit is contained in:
Kanav Arora
2023-11-09 19:48:51 +05:30
committed by GitHub
parent aa09b5758c
commit 279630052f
8 changed files with 111 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
front/src/modules/command-menu/components/CommandMenu.tsx
View File

@ -88,13 +88,9 @@ export const CommandMenu = () => {
const activities = activityData?.searchResults ?? [];
const checkInShortcuts = (cmd: Command, search: string) => {
if (cmd.shortcuts && cmd.shortcuts.length > 0) {
return cmd.shortcuts
.join('')
.toLowerCase()
.includes(search.toLowerCase());
}
return false;
return (cmd.firstHotKey + (cmd.secondHotKey ?? ''))
.toLowerCase()
.includes(search.toLowerCase());
};
const checkInLabels = (cmd: Command, search: string) => {
@ -144,7 +140,8 @@ export const CommandMenu = () => {
Icon={cmd.Icon}
label={cmd.label}
onClick={cmd.onCommandClick}
shortcuts={cmd.shortcuts || []}
firstHotKey={cmd.firstHotKey}
secondHotKey={cmd.secondHotKey}
/>
))}
</CommandGroup>
@ -156,7 +153,8 @@ export const CommandMenu = () => {
label={cmd.label}
Icon={cmd.Icon}
onClick={cmd.onCommandClick}
shortcuts={cmd.shortcuts || []}
firstHotKey={cmd.firstHotKey}
secondHotKey={cmd.secondHotKey}
/>
))}
</CommandGroup>

9
front/src/modules/command-menu/components/CommandMenuItem.tsx
View File

@ -12,7 +12,8 @@ export type CommandMenuItemProps = {
key: string;
onClick?: () => void;
Icon?: IconComponent;
shortcuts?: Array<string>;
firstHotKey?: string;
secondHotKey?: string;
};
export const CommandMenuItem = ({
@ -20,7 +21,8 @@ export const CommandMenuItem = ({
to,
onClick,
Icon,
shortcuts,
firstHotKey,
secondHotKey,
}: CommandMenuItemProps) => {
const navigate = useNavigate();
const { closeCommandMenu } = useCommandMenu();
@ -46,7 +48,8 @@ export const CommandMenuItem = ({
<MenuItemCommand
LeftIcon={Icon}
text={label}
command={shortcuts ? shortcuts.join(' then ') : ''}
firstHotKey={firstHotKey}
secondHotKey={secondHotKey}
onClick={onItemClick}
/>
);