feat(database): optimize the behavior of the Enter key for the title …

…column (toeverything#2962)
Alkaidcc · Jun 8, 2023 · a29815f · a29815f
1 parent be4ca1c
commit a29815f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/packages/blocks/src/__internal__/rich-text/rich-text-operations.ts b/packages/blocks/src/__internal__/rich-text/rich-text-operations.ts
@@ -49,11 +49,13 @@ export function handleBlockEndEnter(page: Page, model: ExtendedModel) {
     const index = parent.children.findIndex(child => child.id === model.id);
     let newParent: BaseBlockModel = parent;
     let newBlockIndex = index + 1;
+    const childrenLength = parent.children.length;
+
+    if (index === childrenLength - 1 && model.text?.yText.length === 0) {
+      if (childrenLength !== 1) {
+        page.deleteBlock(model);
+      }
 
-    if (
-      index === parent.children.length - 1 &&
-      model.text?.yText.length === 0
-    ) {
       const nextModel = page.getNextSibling(newParent);
       if (nextModel && matchFlavours(nextModel, ['affine:paragraph'])) {
         asyncFocusRichText(page, nextModel.id, {

diff --git a/packages/blocks/src/__internal__/service/keymap.ts b/packages/blocks/src/__internal__/service/keymap.ts
@@ -57,7 +57,7 @@ export function hardEnter(
   if (
     isEmptyList &&
     parent &&
-    matchFlavours(parent, ['affine:frame']) &&
+    matchFlavours(parent, ['affine:frame', 'affine:database']) &&
     model.children.length === 0
   ) {
     // TODO use `handleLineStartBackspace` directly is not concise enough,