mukeshs/twenty_crm
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: prevent unwanted newlines in note editor when typing (#12128)

Browse Source 
https://github.com/user-attachments/assets/16706d7a-fe0e-4979-bd72-00f4bfec594b

Closes #12119

---------

Co-authored-by: Charles Bochet <charlesBochet@users.noreply.github.com>
This commit is contained in:
Abdul Rahman
2025-05-20 02:13:49 +05:30
committed by GitHub
parent cba36af1e8
commit 85e2a2a92b
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/twenty-front/src/modules/activities/components/ActivityRichTextEditor.tsx
View File

@ -1,6 +1,6 @@
import { useApolloClient } from '@apollo/client';
import { useCallback, useMemo } from 'react';
import { useRecoilCallback, useRecoilState } from 'recoil';
import { useRecoilCallback, useRecoilState, useRecoilValue } from 'recoil';
import { v4 } from 'uuid';
import { useUploadAttachmentFile } from '@/activities/files/hooks/useUploadAttachmentFile';
@ -26,7 +26,9 @@ import { Task } from '@/activities/types/Task';
import { filterAttachmentsToRestore } from '@/activities/utils/filterAttachmentsToRestore';
import { getActivityAttachmentIdsToDelete } from '@/activities/utils/getActivityAttachmentIdsToDelete';
import { getActivityAttachmentPathsToRestore } from '@/activities/utils/getActivityAttachmentPathsToRestore';
import { commandMenuPageState } from '@/command-menu/states/commandMenuPageState';
import { CommandMenuHotkeyScope } from '@/command-menu/types/CommandMenuHotkeyScope';
import { CommandMenuPages } from '@/command-menu/types/CommandMenuPages';
import { useDeleteManyRecords } from '@/object-record/hooks/useDeleteManyRecords';
import { useLazyFetchAllRecords } from '@/object-record/hooks/useLazyFetchAllRecords';
import { useRestoreManyRecords } from '@/object-record/hooks/useRestoreManyRecords';
@ -295,6 +297,8 @@ export const ActivityRichTextEditor = ({
uploadFile: handleEditorBuiltInUploadFile,
});
const commandMenuPage = useRecoilValue(commandMenuPageState);
useScopedHotkeys(
Key.Escape,
() => {
@ -306,6 +310,11 @@ export const ActivityRichTextEditor = ({
useScopedHotkeys(
'*',
(keyboardEvent) => {
// TODO: remove once stacked hotkeys / focusKeys are in place
if (commandMenuPage !== CommandMenuPages.EditRichText) {
return;
}
if (keyboardEvent.key === Key.Escape) {
return;
}