chore: bump bs (#8071)

packages/frontend/core/src/components/affine/reference-link/index.tsx

@@ -7,7 +7,7 @@ import {
 import { WorkbenchLink } from '@affine/core/modules/workbench';
 import { useI18n } from '@affine/i18n';
 import type { BlockStdScope } from '@blocksuite/block-std';
-import { DocMode } from '@blocksuite/blocks';
+import type { DocMode } from '@blocksuite/blocks';
 import {
   BlockLinkIcon,
   DeleteIcon,
@@ -57,7 +57,7 @@ export function pageReferenceRenderer({
   let Icon = DeleteIcon;
 
   if (referencedPage) {
-    if (docMode === DocMode.Edgeless) {
+    if (docMode === 'edgeless') {
       Icon = LinkedEdgelessIcon;
     } else {
       Icon = LinkedPageIcon;
@@ -88,7 +88,7 @@ export function AffinePageReference({
   pageId,
   docCollection,
   wrapper: Wrapper,
-  mode = DocMode.Page,
+  mode = 'page',
   params = {},
   isSameDoc = false,
   std,
@@ -133,7 +133,7 @@ export function AffinePageReference({
 
   useEffect(() => {
     if (isSameDoc) {
-      if (mode === DocMode.Edgeless && elementIds?.length) {
+      if (mode === 'edgeless' && elementIds?.length) {
         setAnchor({ mode, id: elementIds[0] });
       } else if (blockIds?.length) {
         setAnchor({ mode, id: blockIds[0] });

packages/frontend/core/src/components/affine/reference-link/utils.ts

@@ -1,8 +1,8 @@
 import type { BlockStdScope } from '@blocksuite/block-std';
-import {
+import type {
   DocMode,
-  type EdgelessRootService,
-  type PageRootService,
+  EdgelessRootService,
+  PageRootService,
 } from '@blocksuite/blocks';
 import { Bound, deserializeXYWH } from '@blocksuite/global/utils';
 
@@ -71,7 +71,7 @@ function scrollAnchoringInEdgelessMode(
 
 function scrollAnchoringInPageMode(service: PageRootService, id: string) {
   const blockComponent = service.std.view.getBlock(id);
-  if (!blockComponent || !blockComponent.path.length) return;
+  if (!blockComponent) return;
 
   blockComponent.scrollIntoView({
     behavior: 'instant',
@@ -92,7 +92,7 @@ function scrollAnchoringInPageMode(service: PageRootService, id: string) {
 
 // TODO(@fundon): it should be a command
 export function scrollAnchoring(std: BlockStdScope, mode: DocMode, id: string) {
-  if (mode === DocMode.Edgeless) {
+  if (mode === 'edgeless') {
     const service = std.getService<EdgelessRootService>('affine:page');
     if (!service) return;
 

packages/frontend/core/src/components/blocksuite/block-suite-editor/blocksuite-editor-container.tsx

@@ -1,6 +1,6 @@
 import type { EditorSelector } from '@affine/core/modules/editor';
 import type { ReferenceInfo } from '@blocksuite/affine-model';
-import { DocMode } from '@blocksuite/blocks';
+import type { DocMode } from '@blocksuite/blocks';
 import type { InlineEditor } from '@blocksuite/inline/inline-editor';
 import type {
   AffineEditorContainer,
@@ -68,10 +68,7 @@ export const BlocksuiteEditorContainer = forwardRef<
   const docTitleRef = useRef<DocTitle>(null);
   const edgelessRef = useRef<EdgelessEditor>(null);
   const [anchor] = useState<string | null>(() => {
-    if (
-      mode === DocMode.Edgeless &&
-      defaultEditorSelector?.elementIds?.length
-    ) {
+    if (mode === 'edgeless' && defaultEditorSelector?.elementIds?.length) {
       return defaultEditorSelector.elementIds[0];
     } else if (defaultEditorSelector?.blockIds?.length) {
       return defaultEditorSelector.blockIds[0];

packages/frontend/core/src/components/blocksuite/block-suite-editor/lit-adaper.tsx

@@ -6,7 +6,7 @@ import {
 import { useJournalInfoHelper } from '@affine/core/hooks/use-journal';
 import { EditorSettingService } from '@affine/core/modules/editor-settting';
 import { PeekViewService } from '@affine/core/modules/peek-view';
-import { DocMode } from '@blocksuite/blocks';
+import type { DocMode } from '@blocksuite/blocks';
 import { DocTitle, EdgelessEditor, PageEditor } from '@blocksuite/presets';
 import type { Doc } from '@blocksuite/store';
 import {
@@ -186,7 +186,7 @@ export const BlocksuiteDocEditor = forwardRef<
     [externalTitleRef]
   );
 
-  const [specs, portals] = usePatchSpecs(page, !!shared, DocMode.Page);
+  const [specs, portals] = usePatchSpecs(page, !!shared, 'page');
 
   const settings = useLiveData(editorSettingService.editorSetting.settings$);
 
@@ -219,7 +219,7 @@ export const BlocksuiteEdgelessEditor = forwardRef<
   EdgelessEditor,
   BlocksuiteEditorProps
 >(function BlocksuiteEdgelessEditor({ page, shared }, ref) {
-  const [specs, portals] = usePatchSpecs(page, !!shared, DocMode.Edgeless);
+  const [specs, portals] = usePatchSpecs(page, !!shared, 'edgeless');
   const editorRef = useRef<EdgelessEditor | null>(null);
 
   const onDocRef = useCallback(

packages/frontend/core/src/components/blocksuite/block-suite-editor/specs/custom/spec-patchers.tsx

@@ -30,16 +30,17 @@ import { BlockServiceWatcher } from '@blocksuite/block-std';
 import type {
   AffineReference,
   DatabaseBlockService,
+  DocMode,
   ListBlockService,
   ParagraphBlockService,
   RootService,
 } from '@blocksuite/blocks';
 import {
   AffineSlashMenuWidget,
-  DocMode,
   DocModeProvider,
   EdgelessRootBlockComponent,
   EmbedLinkedDocBlockComponent,
+  QuickSearchProvider,
 } from '@blocksuite/blocks';
 import { LinkIcon } from '@blocksuite/icons/rc';
 import { AIChatBlockSchema } from '@blocksuite/presets';
@@ -281,10 +282,9 @@ export function patchDocModeService(
 }
 
 export function patchQuickSearchService(framework: FrameworkProvider) {
-  return patchSpecService<RootService>(
-    'affine:page',
-    pageService => {
-      pageService.quickSearchService = {
+  const QuickSearchExtension: ExtensionType = {
+    setup: di => {
+      di.addImpl(QuickSearchProvider, () => ({
         async searchDoc(options) {
           let searchResult:
             | { docId: string; isNewDoc?: boolean }
@@ -366,8 +366,8 @@ export function patchQuickSearchService(framework: FrameworkProvider) {
                     const docsService = framework.get(DocsService);
                     const mode =
                       result.id === 'creation:create-edgeless'
-                        ? DocMode.Edgeless
-                        : DocMode.Page;
+                        ? 'edgeless'
+                        : 'page';
                     const newDoc = docsService.createDoc({
                       primaryMode: mode,
                       title: result.payload.title,
@@ -393,8 +393,12 @@ export function patchQuickSearchService(framework: FrameworkProvider) {
 
           return searchResult;
         },
-      };
+      }));
     },
+  };
+  const SlashMenuQuickSearchExtension = patchSpecService<RootService>(
+    'affine:page',
+    () => {},
     (component: WidgetComponent) => {
       if (component instanceof AffineSlashMenuWidget) {
         component.config.items.forEach(item => {
@@ -405,7 +409,8 @@ export function patchQuickSearchService(framework: FrameworkProvider) {
             const oldAction = item.action;
             item.action = async ({ model, rootComponent }) => {
               const { host, service, std } = rootComponent;
-              const { quickSearchService } = service;
+              const quickSearchService =
+                component.std.getOptional(QuickSearchProvider);
 
               if (!quickSearchService)
                 return oldAction({ model, rootComponent });
@@ -447,6 +452,7 @@ export function patchQuickSearchService(framework: FrameworkProvider) {
       }
     }
   );
+  return [QuickSearchExtension, SlashMenuQuickSearchExtension];
 }
 
 export function patchEdgelessClipboard() {

packages/frontend/core/src/components/blocksuite/block-suite-mode-switch/index.tsx

@@ -3,7 +3,7 @@ import { registerAffineCommand } from '@affine/core/commands';
 import { track } from '@affine/core/mixpanel';
 import { EditorService } from '@affine/core/modules/editor';
 import { useI18n } from '@affine/i18n';
-import { DocMode } from '@blocksuite/blocks';
+import type { DocMode } from '@blocksuite/blocks';
 import { EdgelessIcon, PageIcon } from '@blocksuite/icons/rc';
 import { useLiveData, useService } from '@toeverything/infra';
 import { useCallback, useEffect, useMemo } from 'react';
@@ -39,16 +39,16 @@ export const EditorModeSwitch = () => {
 
   const togglePage = useCallback(() => {
     if (currentMode === 'page' || isSharedMode || trash) return;
-    editor.setMode(DocMode.Page);
-    editor.doc.setPrimaryMode(DocMode.Page);
+    editor.setMode('page');
+    editor.doc.setPrimaryMode('page');
     toast(t['com.affine.toastMessage.pageMode']());
     track.$.header.actions.switchPageMode({ mode: 'page' });
   }, [currentMode, editor, isSharedMode, t, trash]);
 
   const toggleEdgeless = useCallback(() => {
     if (currentMode === 'edgeless' || isSharedMode || trash) return;
-    editor.setMode(DocMode.Edgeless);
-    editor.doc.setPrimaryMode(DocMode.Edgeless);
+    editor.setMode('edgeless');
+    editor.doc.setPrimaryMode('edgeless');
     toast(t['com.affine.toastMessage.edgelessMode']());
     track.$.header.actions.switchPageMode({ mode: 'edgeless' });
   }, [currentMode, editor, isSharedMode, t, trash]);
@@ -79,10 +79,7 @@ export const EditorModeSwitch = () => {
         binding: 'Alt+KeyS',
         capture: true,
       },
-      run: () =>
-        onModeChange(
-          currentMode === 'edgeless' ? DocMode.Page : DocMode.Edgeless
-        ),
+      run: () => onModeChange(currentMode === 'edgeless' ? 'page' : 'edgeless'),
     });
   }, [currentMode, isSharedMode, onModeChange, t, trash]);
 
@@ -97,8 +94,8 @@ export const EditorModeSwitch = () => {
         <PureEditorModeSwitch
           mode={currentMode}
           setMode={onModeChange}
-          hidePage={shouldHide(DocMode.Page)}
-          hideEdgeless={shouldHide(DocMode.Edgeless)}
+          hidePage={shouldHide('page')}
+          hideEdgeless={shouldHide('edgeless')}
         />
       </div>
     </Tooltip>