feat(common): handle enter event when editing text #WIK-15872 (#935)

worktile · Jul 2, 2024 · 716e8f2 · 716e8f2
1 parent 21da2a0
commit 716e8f2
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 8 deletions.
diff --git a/.changeset/late-jobs-hide.md b/.changeset/late-jobs-hide.md
@@ -0,0 +1,7 @@
+---
+'@plait/common': patch
+'@plait/draw': patch
+'@plait/mind': patch
+---
+
+handle enter event when editing text
diff --git a/packages/common/src/text/text-manage.ts b/packages/common/src/text/text-manage.ts
@@ -103,7 +103,7 @@ export class TextManage {
         this.textComponentRef.update(props);
     }
 
-    edit(callback?: () => void) {
+    edit(callback?: () => void, exitEdit?: (event: Event) => boolean) {
         this.isEditing = true;
         IS_TEXT_EDITABLE.set(this.board, true);
         const props: Partial<TextProps> = {
@@ -127,7 +127,7 @@ export class TextManage {
             if (event.isComposing) {
                 return;
             }
-            if (event.key === 'Escape' || (event.key === 'Enter' && !event.shiftKey) || event.key === 'Tab') {
+            if (event.key === 'Escape' || event.key === 'Tab' || (exitEdit ? exitEdit(event) : false)) {
                 event.preventDefault();
                 event.stopPropagation();
                 exitCallback();

diff --git a/packages/draw/src/plugins/with-table.ts b/packages/draw/src/plugins/with-table.ts
@@ -19,7 +19,7 @@ import { editCell, getHitCell } from '../utils/table';
 import { withTableResize } from './with-table-resize';
 import { isVirtualKey, isDelete, isSpaceHotkey } from '@plait/common';
 import { PlaitDrawElement } from '../interfaces';
-import { getSelectedTableElements, isSingleSelectTable, setSelectedCells } from '../utils';
+import { getSelectedCells, getSelectedTableElements, isSingleSelectTable, setSelectedCells } from '../utils';
 
 export const withTable = (board: PlaitBoard) => {
     const tableBoard = board as PlaitTableBoard;
@@ -68,12 +68,23 @@ export const withTable = (board: PlaitBoard) => {
         const selectedElements = getSelectedElements(board);
         const isSingleSelection = selectedElements.length === 1;
         const targetElement = selectedElements[0];
-        if (!PlaitBoard.isReadonly(board) && !isVirtualKey(event) && !isDelete(event) && !isSpaceHotkey(event) && isSingleSelection) {
+        if (
+            !PlaitBoard.isReadonly(board) &&
+            !PlaitBoard.hasBeenTextEditing(tableBoard) &&
+            !isVirtualKey(event) &&
+            !isDelete(event) &&
+            !isSpaceHotkey(event) &&
+            isSingleSelection
+        ) {
             event.preventDefault();
             if (PlaitDrawElement.isElementByTable(targetElement)) {
-                const firstTextCell = targetElement.cells.find(item => item.text && item.textHeight);
-                if (firstTextCell) {
-                    editCell(firstTextCell);
+                const cells = getSelectedCells(targetElement);
+                let cell = targetElement.cells.find(item => item.text && item.textHeight);
+                if (cells?.length) {
+                    cell = cells.find(item => item.text && item.textHeight);
+                }
+                if (cell) {
+                    editCell(cell);
                     return;
                 }
             }

diff --git a/packages/mind/src/utils/node/common.ts b/packages/mind/src/utils/node/common.ts
@@ -4,7 +4,13 @@ import { getFirstTextManage } from '@plait/common';
 
 export function editTopic(element: MindElement) {
     const textManage = getFirstTextManage(element);
-    textManage?.edit(() => {});
+    textManage?.edit(
+        () => {},
+        event => {
+            const keyboardEvent = event as KeyboardEvent;
+            return keyboardEvent.key === 'Enter' && !keyboardEvent.shiftKey;
+        }
+    );
 }
 
 export const getSelectedMindElements = (board: PlaitBoard, elements?: PlaitElement[]) => {