fix(editor): add member node before mention (#11197)

packages/frontend/core/src/modules/at-menu-config/services/index.ts

@@ -29,6 +29,10 @@ import { computed, Signal, signal } from '@preact/signals-core';
 import { Service } from '@toeverything/infra';
 import { cssVarV2 } from '@toeverything/theme/v2';
 import { html } from 'lit';
+import {
+  createAbsolutePositionFromRelativePosition,
+  createRelativePositionFromTypeIndex,
+} from 'yjs';
 
 import { AuthService, type WorkspaceServerService } from '../../cloud';
 import type { WorkspaceDialogService } from '../../dialogs';
@@ -369,62 +373,80 @@ export class AtMenuConfigService extends Service {
 
           close();
 
-          if (id === currentUserId) {
+          const inlineRange = inlineEditor.getInlineRange();
-            const inlineRange = inlineEditor.getInlineRange();
+          if (!inlineRange || inlineRange.length !== 0) return;
-            if (inlineRange && inlineRange.length === 0) {
-              inlineEditor.insertText(inlineRange, ' ', {
-                mention: {
-                  member: id,
-                },
-              });
-              inlineEditor.setInlineRange({
-                index: inlineRange.index + 1,
-                length: 0,
-              });
-            }
 
-            return;
+          inlineEditor.insertText(inlineRange, ' ', {
-          }
+            mention: {
+              member: id,
+            },
+          });
+          inlineEditor.setInlineRange({
+            index: inlineRange.index + 1,
+            length: 0,
+          });
 
-          notificationService
+          const relativePosition = createRelativePositionFromTypeIndex(
-            .mentionUser(id, workspaceId, {
+            inlineEditor.yText,
-              id: docId,
+            inlineRange.index + 1
-              title: this.docDisplayMetaService.title$(docId).value,
+          );
-              blockId: block.blockId,
+
-              mode: mode as GraphqlDocMode,
+          if (id !== currentUserId) {
-            })
+            notificationService
-            .then(notificationId => {
+              .mentionUser(id, workspaceId, {
-              const inlineRange = inlineEditor.getInlineRange();
+                id: docId,
-              if (inlineRange && inlineRange.length === 0) {
+                title: this.docDisplayMetaService.title$(docId).value,
-                inlineEditor.insertText(inlineRange, ' ', {
+                blockId: block.blockId,
-                  mention: {
+                mode: mode as GraphqlDocMode,
-                    member: id,
+              })
-                    notification: notificationId,
+              .then(notificationId => {
+                const doc = inlineEditor.yText.doc;
+                if (!doc) return;
+                const absolutePosition =
+                  createAbsolutePositionFromRelativePosition(
+                    relativePosition,
+                    doc
+                  );
+                if (!absolutePosition) return;
+                const index = absolutePosition.index;
+
+                const delta = inlineEditor.getDeltaByRangeIndex(index);
+                if (
+                  !delta ||
+                  delta.insert !== ' ' ||
+                  !delta.attributes?.mention ||
+                  delta.attributes.mention.notification ||
+                  delta.attributes.mention.member !== id
+                )
+                  return;
+
+                inlineEditor.formatText(
+                  {
+                    index: index - 1,
+                    length: 1,
                   },
+                  {
+                    mention: {
+                      member: id,
+                      notification: notificationId,
+                    },
+                  }
+                );
+              })
+              .catch(error => {
+                const err = UserFriendlyError.fromAny(error);
+                notify.error({
+                  title: I18n[`error.${err.name}`](err.data),
                 });
-                inlineEditor.setInlineRange({
-                  index: inlineRange.index + 1,
-                  length: 0,
-                });
-              }
-
-              notify.success({
-                title: I18n.t('com.affine.editor.at-menu.mention-success'),
               });
-            })
+          }
-            .catch(error => {
-              const err = UserFriendlyError.fromAny(error);
-              notify.error({
-                title: I18n[`error.${err.name}`](err.data),
-              });
-            });
         },
       };
     };
 
     if (query.length === 0) {
       return {
-        name: I18n.t('com.affine.editor.at-menu.mention-member'),
+        name: I18n.t('com.affine.editor.at-menu.mention-members'),
         items: [
           ...this.memberSearchService.result$.value
             .slice(0, 3)
@@ -446,7 +468,7 @@ export class AtMenuConfigService extends Service {
     this.memberSearchService.search(query);
 
     return {
-      name: I18n.t('com.affine.editor.at-menu.mention-member'),
+      name: I18n.t('com.affine.editor.at-menu.mention-members'),
       items,
       loading,
     };

packages/frontend/i18n/src/i18n.gen.ts

@@ -6928,13 +6928,9 @@ export function useAFFiNEI18N(): {
       */
     ["com.affine.editor.at-menu.date-picker"](): string;
     /**
-      * `Mention Member`
+      * `Mention Members`
       */
-    ["com.affine.editor.at-menu.mention-member"](): string;
+    ["com.affine.editor.at-menu.mention-members"](): string;
-    /**
-      * `Successfully mentioned the member`
-      */
-    ["com.affine.editor.at-menu.mention-success"](): string;
     /**
       * `Show`
       */

packages/frontend/i18n/src/resources/en.json

@@ -1720,8 +1720,7 @@
   "com.affine.editor.at-menu.more-docs-hint": "{{count}} more docs",
   "com.affine.editor.at-menu.journal": "Journal",
   "com.affine.editor.at-menu.date-picker": "Select a specific date",
-  "com.affine.editor.at-menu.mention-member": "Mention Member",
+  "com.affine.editor.at-menu.mention-members": "Mention Members",
-  "com.affine.editor.at-menu.mention-success": "Successfully mentioned the member",
   "com.affine.editor.bi-directional-link-panel.show": "Show",
   "com.affine.editor.bi-directional-link-panel.hide": "Hide",
   "com.affine.editor.edgeless-note-header.fold-page-block": "Fold page block",