Skip to content

There can be more than Notion and Miro. AFFiNE(pronounced [ə‘fain]) is a next-gen knowledge base that brings planning, sorting and creating all together. Privacy first, open-source, customizable and ready to use.

refactor(editor): remove empty block services (#11014)

Saul-Mirone2701be8d08f8
diff --git a/blocksuite/affine/blocks/block-embed/src/embed-synced-doc-block/embed-synced-doc-service.ts b/blocksuite/affine/blocks/block-embed/src/embed-synced-doc-block/embed-synced-doc-service.ts
deleted file mode 100644
index fb734057c8..0000000000
--- a/blocksuite/affine/blocks/block-embed/src/embed-synced-doc-block/embed-synced-doc-service.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { EmbedSyncedDocBlockSchema } from '@blocksuite/affine-model';
-import { BlockService } from '@blocksuite/block-std';
-
-export class EmbedSyncedDocBlockService extends BlockService {
- static override readonly flavour = EmbedSyncedDocBlockSchema.model.flavour;
-}
diff --git a/blocksuite/affine/blocks/block-embed/src/embed-synced-doc-block/embed-synced-doc-spec.ts b/blocksuite/affine/blocks/block-embed/src/embed-synced-doc-block/embed-synced-doc-spec.ts
index 6d5e295fc3..081bdbda17 100644
--- a/blocksuite/affine/blocks/block-embed/src/embed-synced-doc-block/embed-synced-doc-spec.ts
+++ b/blocksuite/affine/blocks/block-embed/src/embed-synced-doc-block/embed-synced-doc-spec.ts
@@ -5,13 +5,11 @@ import { literal } from 'lit/static-html.js';
import { EmbedSyncedDocBlockAdapterExtensions } from './adapters/extension';
import { createBuiltinToolbarConfigExtension } from './configs/toolbar';
-import { EmbedSyncedDocBlockService } from './embed-synced-doc-service';
const flavour = EmbedSyncedDocBlockSchema.model.flavour;
export const EmbedSyncedDocBlockSpec: ExtensionType[] = [
FlavourExtension(flavour),
- EmbedSyncedDocBlockService,
BlockViewExtension(flavour, model => {
return model.parent?.flavour === 'affine:surface'
? literal`affine-embed-edgeless-synced-doc-block`
diff --git a/blocksuite/affine/blocks/block-image/src/image-service.ts b/blocksuite/affine/blocks/block-image/src/image-service.ts
index 962c5bb285..f5e176944a 100644
--- a/blocksuite/affine/blocks/block-image/src/image-service.ts
+++ b/blocksuite/affine/blocks/block-image/src/image-service.ts
@@ -9,15 +9,10 @@ import {
isInsideEdgelessEditor,
matchModels,
} from '@blocksuite/affine-shared/utils';
-import { BlockService } from '@blocksuite/block-std';
import { GfxControllerIdentifier } from '@blocksuite/block-std/gfx';
import { addImages, addSiblingImageBlock } from './utils.js';
-export class ImageBlockService extends BlockService {
- static override readonly flavour = ImageBlockSchema.model.flavour;
-}
-
export const ImageDropOption = FileDropConfigExtension({
flavour: ImageBlockSchema.model.flavour,
onDrop: ({ files, targetModel, placement, point, std }) => {
diff --git a/blocksuite/affine/blocks/block-image/src/image-spec.ts b/blocksuite/affine/blocks/block-image/src/image-spec.ts
index 1071d7c13f..99b8e0c0fc 100644
--- a/blocksuite/affine/blocks/block-image/src/image-spec.ts
+++ b/blocksuite/affine/blocks/block-image/src/image-spec.ts
@@ -12,7 +12,7 @@ import { ImageBlockAdapterExtensions } from './adapters/extension';
import { imageSlashMenuConfig } from './configs/slash-menu';
import { createBuiltinToolbarConfigExtension } from './configs/toolbar';
import { ImageProxyService } from './image-proxy-service';
-import { ImageBlockService, ImageDropOption } from './image-service';
+import { ImageDropOption } from './image-service';
const flavour = ImageBlockSchema.model.flavour;
@@ -24,7 +24,6 @@ export const imageToolbarWidget = WidgetViewExtension(
export const ImageBlockSpec: ExtensionType[] = [
FlavourExtension(flavour),
- ImageBlockService,
BlockViewExtension(flavour, model => {
const parent = model.doc.getParent(model.id);
diff --git a/blocksuite/affine/widgets/widget-edgeless-auto-connect/src/index.ts b/blocksuite/affine/widgets/widget-edgeless-auto-connect/src/index.ts
index 106737c752..3a93557f58 100644
--- a/blocksuite/affine/widgets/widget-edgeless-auto-connect/src/index.ts
+++ b/blocksuite/affine/widgets/widget-edgeless-auto-connect/src/index.ts
@@ -195,6 +195,7 @@ export class EdgelessAutoConnectWidget extends WidgetComponent<RootBlockModel> {
const notes = root.children.filter(child =>
matchModels(child, [NoteBlockModel])
);
+
const edgelessOnlyNotesSet = new Set<NoteBlockModel>();
notes.forEach(note => {