Skip to content

The open alternative to Salesforce, designed for AI.

Preserve typed characters when focusing the activity editor (#25172)

Weiko429b75685de8
diff --git a/packages/twenty-front/src/modules/activities/components/ActivityRichTextEditor.tsx b/packages/twenty-front/src/modules/activities/components/ActivityRichTextEditor.tsx
index c90df668011..8a64560452f 100644
--- a/packages/twenty-front/src/modules/activities/components/ActivityRichTextEditor.tsx
+++ b/packages/twenty-front/src/modules/activities/components/ActivityRichTextEditor.tsx
@@ -1,6 +1,5 @@
import { useStore } from 'jotai';
import { useCallback, useRef } from 'react';
-import { v4 } from 'uuid';
import { useUpsertActivity } from '@/activities/hooks/useUpsertActivity';
import { canCreateActivityState } from '@/activities/states/canCreateActivityState';
@@ -14,14 +13,10 @@ import { recordStoreFamilyState } from '@/object-record/record-store/states/reco
import { isTitleCellInEditModeComponentState } from '@/object-record/record-title-cell/states/isTitleCellInEditModeComponentState';
import { RecordTitleCellContainerType } from '@/object-record/record-title-cell/types/RecordTitleCellContainerType';
import { getRecordFieldInputInstanceId } from '@/object-record/utils/getRecordFieldInputId';
-import { SIDE_PANEL_FOCUS_ID } from '@/side-panel/constants/SidePanelFocusId';
import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushFocusItemToFocusStack';
import { useRemoveFocusItemFromFocusStackById } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackById';
import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';
-import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';
-import { isNonTextWritingKey } from '@/ui/utilities/hotkey/utils/isNonTextWritingKey';
import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
-import { Key } from 'ts-key-enum';
import { type CoreObjectNameSingular } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
@@ -128,53 +123,6 @@ export const ActivityRichTextEditor = ({
removeFocusItemFromFocusStackById({ focusId: activityId });
}, [activityId, recordTitleCellId, removeFocusItemFromFocusStackById, store]);
- const focusRichTextEditorWhenFocusOnSidePanel = (
- keyboardEvent: KeyboardEvent,
- ) => {
- if (keyboardEvent.key === Key.Escape) {
- return;
- }
-
- const isWritingText =
- !isNonTextWritingKey(keyboardEvent.key) &&
- !keyboardEvent.ctrlKey &&
- !keyboardEvent.metaKey;
-
- if (!isWritingText) {
- return;
- }
-
- const editor = editorRef.current;
-
- if (!editor) {
- return;
- }
-
- keyboardEvent.preventDefault();
- keyboardEvent.stopPropagation();
- keyboardEvent.stopImmediatePropagation();
-
- const newBlockId = v4();
- const newBlock = {
- id: newBlockId,
- type: 'paragraph' as const,
- content: keyboardEvent.key,
- };
-
- const lastBlock = editor.document[editor.document.length - 1];
- editor.insertBlocks([newBlock], lastBlock);
-
- editor.setTextCursorPosition(newBlockId, 'end');
- editor.focus();
- };
-
- useHotkeysOnFocusedElement({
- keys: '*',
- callback: focusRichTextEditorWhenFocusOnSidePanel,
- focusId: SIDE_PANEL_FOCUS_ID,
- dependencies: [focusRichTextEditorWhenFocusOnSidePanel],
- });
-
return (
<RichTextFieldEditor
recordId={activityId}