chore(core): cancel block not found alert

toeverything · Sep 19, 2024 · 74b36e6 · 74b36e6
1 parent 0450fce
commit 74b36e6
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 57 deletions.
diff --git a/packages/frontend/core/src/modules/editor/entities/editor.ts b/packages/frontend/core/src/modules/editor/entities/editor.ts
@@ -13,7 +13,6 @@ import { paramsParseOptions, preprocessParams } from '../../navigation/utils';
 import type { WorkbenchView } from '../../workbench';
 import { EditorScope } from '../scopes/editor';
 import type { EditorSelector } from '../types';
-import { scrollAnchoring } from '../utils/scroll-anchoring';
 
 export class Editor extends Entity {
   readonly scope = this.framework.createScope(EditorScope, {
@@ -159,14 +158,20 @@ export class Editor extends Entity {
 
     const focusAt$ = LiveData.computed(get => {
       const selector = get(this.selector$);
-      const id =
-        get(this.mode$) === 'edgeless' && selector?.elementIds?.length
-          ? selector?.elementIds?.[0]
-          : selector?.blockIds?.[0];
+      let id = selector?.blockIds?.[0];
+      let key = 'blockIds';
+
+      if (get(this.mode$) === 'edgeless') {
+        const elementId = selector?.elementIds?.[0];
+        if (elementId) {
+          id = elementId;
+          key = 'elementIds';
+        }
+      }
 
       if (!id) return null;
 
-      return { id, refreshKey: selector?.refreshKey };
+      return { id, key, refreshKey: selector?.refreshKey };
     });
     if (focusAt$.value === null && docTitle) {
       const title = docTitle.querySelector<
@@ -177,15 +182,25 @@ export class Editor extends Entity {
 
     const subscription = focusAt$
       .distinctUntilChanged(
-        (a, b) => a?.id === b?.id && a?.refreshKey === b?.refreshKey
+        (a, b) =>
+          a?.id === b?.id &&
+          a?.key === b?.key &&
+          a?.refreshKey === b?.refreshKey
       )
-      .subscribe(params => {
-        if (!params?.id) return;
+      .subscribe(anchor => {
+        if (!anchor) return;
+
+        const selection = editorContainer.host?.std.selection;
+        if (!selection) return;
 
-        const std = editorContainer.host?.std;
-        if (!std) return;
+        const { id, key } = anchor;
 
-        scrollAnchoring(std, this.mode$.value, params.id);
+        selection.setGroup('scene', [
+          selection.create('highlight', {
+            mode,
+            [key]: [id],
+          }),
+        ]);
       });
     unsubs.push(subscription.unsubscribe.bind(subscription));
 

diff --git a/packages/frontend/core/src/modules/editor/utils/scroll-anchoring.ts b/packages/frontend/core/src/modules/editor/utils/scroll-anchoring.ts
diff --git a/packages/frontend/i18n/src/resources/en.json b/packages/frontend/i18n/src/resources/en.json
@@ -26,8 +26,6 @@
   "Back Home": "Back home",
   "Back to Quick Search": "Back to quick search",
   "Back to all": "Back to all",
-  "Block not found": "Block not found",
-  "Block not found description": "The block you are trying to access does not exist or has been removed.",
   "Body text": "Body text",
   "Bold": "Bold",
   "Cancel": "Cancel",