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

Fix right drawer not capture keys conflicting with app shortcuts

Browse Source
This commit is contained in:
Charles Bochet
2023-07-08 20:05:02 -07:00
parent 691da0ef57
commit fffb8c99cb
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
front/src/modules/comments/components/RightDrawerComments.tsx
View File

@ -1,6 +1,8 @@
import { useRecoilState } from 'recoil'; import { useRecoilState } from 'recoil';
import { CommentThreadForDrawer } from '@/comments/types/CommentThreadForDrawer'; import { CommentThreadForDrawer } from '@/comments/types/CommentThreadForDrawer';
import { useHotkeysScopeOnMountOnly } from '@/hotkeys/hooks/useHotkeysScopeOnMountOnly';
import { InternalHotkeysScope } from '@/hotkeys/types/internal/InternalHotkeysScope';
import { RightDrawerBody } from '@/ui/layout/right-drawer/components/RightDrawerBody'; import { RightDrawerBody } from '@/ui/layout/right-drawer/components/RightDrawerBody';
import { RightDrawerPage } from '@/ui/layout/right-drawer/components/RightDrawerPage'; import { RightDrawerPage } from '@/ui/layout/right-drawer/components/RightDrawerPage';
import { RightDrawerTopBar } from '@/ui/layout/right-drawer/components/RightDrawerTopBar'; import { RightDrawerTopBar } from '@/ui/layout/right-drawer/components/RightDrawerTopBar';
@ -15,6 +17,10 @@ import { CommentThread } from './CommentThread';
export function RightDrawerComments() { export function RightDrawerComments() {
const [commentableEntityArray] = useRecoilState(commentableEntityArrayState); const [commentableEntityArray] = useRecoilState(commentableEntityArrayState);
useHotkeysScopeOnMountOnly({
scope: InternalHotkeysScope.RightDrawer,
customScopes: { goto: false, 'command-menu': true },
});
const { data: queryResult } = useGetCommentThreadsByTargetsQuery({ const { data: queryResult } = useGetCommentThreadsByTargetsQuery({
variables: { variables: {

6
front/src/modules/comments/components/RightDrawerCreateCommentThread.tsx
View File

@ -1,3 +1,5 @@
import { useHotkeysScopeOnMountOnly } from '@/hotkeys/hooks/useHotkeysScopeOnMountOnly';
import { InternalHotkeysScope } from '@/hotkeys/types/internal/InternalHotkeysScope';
import { RightDrawerBody } from '@/ui/layout/right-drawer/components/RightDrawerBody'; import { RightDrawerBody } from '@/ui/layout/right-drawer/components/RightDrawerBody';
import { RightDrawerPage } from '@/ui/layout/right-drawer/components/RightDrawerPage'; import { RightDrawerPage } from '@/ui/layout/right-drawer/components/RightDrawerPage';
import { RightDrawerTopBar } from '@/ui/layout/right-drawer/components/RightDrawerTopBar'; import { RightDrawerTopBar } from '@/ui/layout/right-drawer/components/RightDrawerTopBar';
@ -5,6 +7,10 @@ import { RightDrawerTopBar } from '@/ui/layout/right-drawer/components/RightDraw
import { CommentThreadCreateMode } from './CommentThreadCreateMode'; import { CommentThreadCreateMode } from './CommentThreadCreateMode';
export function RightDrawerCreateCommentThread() { export function RightDrawerCreateCommentThread() {
useHotkeysScopeOnMountOnly({
scope: InternalHotkeysScope.RightDrawer,
customScopes: { goto: false, 'command-menu': true },
});
return ( return (
<RightDrawerPage> <RightDrawerPage>
<RightDrawerTopBar title="New comment" /> <RightDrawerTopBar title="New comment" />