From 8183552011d04cb5221ad5a7d0acce441248d453 Mon Sep 17 00:00:00 2001
From: SaikaSakura <a564995200@gmail.com>
Date: Wed, 10 Aug 2022 16:07:52 +0800
Subject: [PATCH 1/2] feat: fix backspeace

---
 .../src/blocks/text/TextView.tsx              | 19 ++++++++++++-------
 .../src/menu/command-menu/Menu.tsx            |  3 +++
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/libs/components/editor-blocks/src/blocks/text/TextView.tsx b/libs/components/editor-blocks/src/blocks/text/TextView.tsx
index cb408cb189..8d1726a9a9 100644
--- a/libs/components/editor-blocks/src/blocks/text/TextView.tsx
+++ b/libs/components/editor-blocks/src/blocks/text/TextView.tsx
@@ -112,13 +112,18 @@ export const TextView: FC<CreateTextView> = ({
                             block.id,
                             'end'
                         );
-                        const value = [
-                            ...preNode.getProperty('text').value,
-                            ...block.getProperty('text').value,
-                        ];
-                        await preNode.setProperty('text', {
-                            value,
-                        });
+                        if (
+                            block.getProperty('text').value[0] &&
+                            block.getProperty('text').value[0]?.text !== ''
+                        ) {
+                            const value = [
+                                ...preNode.getProperty('text').value,
+                                ...block.getProperty('text').value,
+                            ];
+                            await preNode.setProperty('text', {
+                                value,
+                            });
+                        }
                         await preNode.append(...children);
                         await block.remove();
                         editor.suspend(false);
diff --git a/libs/components/editor-plugins/src/menu/command-menu/Menu.tsx b/libs/components/editor-plugins/src/menu/command-menu/Menu.tsx
index b6d174e513..fc5583a2ee 100644
--- a/libs/components/editor-plugins/src/menu/command-menu/Menu.tsx
+++ b/libs/components/editor-plugins/src/menu/command-menu/Menu.tsx
@@ -83,6 +83,9 @@ export const CommandMenu = ({ editor, hooks, style }: CommandMenuProps) => {
         async (event: React.KeyboardEvent<HTMLDivElement>) => {
             const { type, anchorNode } = editor.selection.currentSelectInfo;
             // console.log(await editor.getBlockById(anchorNode.id));
+            if (!anchorNode?.id) {
+                return;
+            }
             const activeBlock = await editor.getBlockById(anchorNode.id);
             if (activeBlock.type === Protocol.Block.Type.page) {
                 return;

From bb0219c5edaa9e298841e327cc8ded6ac86043c7 Mon Sep 17 00:00:00 2001
From: QiShaoXuan <qishaoxuan777@gmail.com>
Date: Thu, 11 Aug 2022 21:43:51 +0800
Subject: [PATCH 2/2] feat: support keep block in view

---
 libs/components/editor-core/src/editor/selection/selection.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/components/editor-core/src/editor/selection/selection.ts b/libs/components/editor-core/src/editor/selection/selection.ts
index b66d1b5fd6..1c45060cd6 100644
--- a/libs/components/editor-core/src/editor/selection/selection.ts
+++ b/libs/components/editor-core/src/editor/selection/selection.ts
@@ -692,7 +692,7 @@ export class SelectionManager implements VirgoSelection {
                 this.emit(nodeId, SelectEventTypes.active, this.lastPoint);
                 // TODO: Optimize the related logic after implementing the scroll bar
                 setTimeout(() => {
-                    // this._editor.scrollManager.keepBlockInView(node);
+                    this._editor.scrollManager.keepBlockInView(node);
                 }, this._scrollDelay);
             } else {
                 console.warn('Can not find node by this id');