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

Feat/better hotkeys scope (#526)

Browse Source 
* Working version

* fix

* Fixed console log

* Fix lint

* wip

* Fix

* Fix

* consolelog

---------

Co-authored-by: Charles Bochet <charles@twenty.com>
This commit is contained in:
Lucas Bordeau
2023-07-08 03:53:05 +02:00
committed by GitHub
parent 611cda1f41
commit 66dcc9b2e1
77 changed files with 1240 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
front/src/modules/people/components/PeopleCompanyCell.tsx
View File

@ -1,4 +1,5 @@
import CompanyChip from '@/companies/components/CompanyChip';
import { InternalHotkeysScope } from '@/hotkeys/types/internal/InternalHotkeysScope';
import { useRecoilScopedState } from '@/recoil-scope/hooks/useRecoilScopedState';
import { EditableCell } from '@/ui/components/editable-cell/EditableCell';
import { isCreateModeScopedState } from '@/ui/components/editable-cell/states/isCreateModeScopedState';
@ -19,6 +20,9 @@ export function PeopleCompanyCell({ people }: OwnProps) {
return (
<EditableCell
editHotkeysScope={
!isCreating ? { scope: InternalHotkeysScope.RelationPicker } : undefined
}
editModeContent={
isCreating ? (
<PeopleCompanyCreateCell people={people} />

11
front/src/modules/people/components/PeopleCompanyPicker.tsx
View File

@ -1,3 +1,7 @@
import { Key } from 'ts-key-enum';
import { useScopedHotkeys } from '@/hotkeys/hooks/useScopedHotkeys';
import { InternalHotkeysScope } from '@/hotkeys/types/internal/InternalHotkeysScope';
import { useRecoilScopedState } from '@/recoil-scope/hooks/useRecoilScopedState';
import { SingleEntitySelect } from '@/relation-picker/components/SingleEntitySelect';
import { useFilteredSearchEntityQuery } from '@/relation-picker/hooks/useFilteredSearchEntityQuery';
@ -57,6 +61,13 @@ export function PeopleCompanyPicker({ people }: OwnProps) {
setIsCreating(true);
}
useScopedHotkeys(
Key.Escape,
() => closeEditableCell(),
InternalHotkeysScope.RelationPicker,
[closeEditableCell],
);
return (
<SingleEntitySelect
onCreate={handleCreate}