feat(editor): surface ref extension (#11902)

Closes: BS-3203
This commit is contained in:
Saul-Mirone
2025-04-23 01:16:07 +00:00
parent 020c1a7598
commit e57222b89a
19 changed files with 96 additions and 92 deletions

View File

@@ -135,7 +135,9 @@
"./blocks/paragraph/view": "./src/blocks/paragraph/view.ts", "./blocks/paragraph/view": "./src/blocks/paragraph/view.ts",
"./blocks/root": "./src/blocks/root.ts", "./blocks/root": "./src/blocks/root.ts",
"./blocks/surface": "./src/blocks/surface.ts", "./blocks/surface": "./src/blocks/surface.ts",
"./blocks/surface-ref": "./src/blocks/surface-ref.ts", "./blocks/surface-ref": "./src/blocks/surface-ref/index.ts",
"./blocks/surface-ref/store": "./src/blocks/surface-ref/store.ts",
"./blocks/surface-ref/view": "./src/blocks/surface-ref/view.ts",
"./blocks/table": "./src/blocks/table.ts", "./blocks/table": "./src/blocks/table.ts",
"./data-view": "./src/data-view/index.ts", "./data-view": "./src/data-view/index.ts",
"./data-view/effects": "./src/data-view/effects.ts", "./data-view/effects": "./src/data-view/effects.ts",

View File

@@ -13,6 +13,7 @@ import { LatexStoreExtension } from '@blocksuite/affine-block-latex/store';
import { ListStoreExtension } from '@blocksuite/affine-block-list/store'; import { ListStoreExtension } from '@blocksuite/affine-block-list/store';
import { NoteStoreExtension } from '@blocksuite/affine-block-note/store'; import { NoteStoreExtension } from '@blocksuite/affine-block-note/store';
import { ParagraphStoreExtension } from '@blocksuite/affine-block-paragraph/store'; import { ParagraphStoreExtension } from '@blocksuite/affine-block-paragraph/store';
import { SurfaceRefStoreExtension } from '@blocksuite/affine-block-surface-ref/store';
import { StoreExtensionManager } from '@blocksuite/affine-ext-loader'; import { StoreExtensionManager } from '@blocksuite/affine-ext-loader';
import { MigratingStoreExtension } from '../../extensions/store'; import { MigratingStoreExtension } from '../../extensions/store';
@@ -33,6 +34,7 @@ const manager = new StoreExtensionManager([
ListStoreExtension, ListStoreExtension,
NoteStoreExtension, NoteStoreExtension,
ParagraphStoreExtension, ParagraphStoreExtension,
SurfaceRefStoreExtension,
MigratingStoreExtension, MigratingStoreExtension,
]); ]);

View File

@@ -0,0 +1 @@
export * from '@blocksuite/affine-block-surface-ref/store';

View File

@@ -0,0 +1 @@
export * from '@blocksuite/affine-block-surface-ref/view';

View File

@@ -1,6 +1,5 @@
import { effects as blockRootEffects } from '@blocksuite/affine-block-root/effects'; import { effects as blockRootEffects } from '@blocksuite/affine-block-root/effects';
import { effects as blockSurfaceEffects } from '@blocksuite/affine-block-surface/effects'; import { effects as blockSurfaceEffects } from '@blocksuite/affine-block-surface/effects';
import { effects as blockSurfaceRefEffects } from '@blocksuite/affine-block-surface-ref/effects';
import { effects as blockTableEffects } from '@blocksuite/affine-block-table/effects'; import { effects as blockTableEffects } from '@blocksuite/affine-block-table/effects';
import { BlockSelection } from '@blocksuite/affine-components/block-selection'; import { BlockSelection } from '@blocksuite/affine-components/block-selection';
import { BlockZeroWidth } from '@blocksuite/affine-components/block-zero-width'; import { BlockZeroWidth } from '@blocksuite/affine-components/block-zero-width';
@@ -62,7 +61,6 @@ export function effects() {
inlineMentionEffects(); inlineMentionEffects();
blockSurfaceEffects(); blockSurfaceEffects();
blockSurfaceRefEffects();
blockTableEffects(); blockTableEffects();
blockRootEffects(); blockRootEffects();

View File

@@ -11,10 +11,6 @@ import {
PageSurfaceBlockSpec, PageSurfaceBlockSpec,
SurfaceBlockAdapterExtensions, SurfaceBlockAdapterExtensions,
} from '@blocksuite/affine-block-surface'; } from '@blocksuite/affine-block-surface';
import {
EdgelessSurfaceRefBlockSpec,
PageSurfaceRefBlockSpec,
} from '@blocksuite/affine-block-surface-ref';
import { TableBlockSpec } from '@blocksuite/affine-block-table'; import { TableBlockSpec } from '@blocksuite/affine-block-table';
import { import {
brushToMarkdownAdapterMatcher, brushToMarkdownAdapterMatcher,
@@ -82,7 +78,6 @@ const CommonBlockSpecs: ExtensionType[] = [
const PageFirstPartyBlockSpecs: ExtensionType[] = [ const PageFirstPartyBlockSpecs: ExtensionType[] = [
CommonBlockSpecs, CommonBlockSpecs,
PageSurfaceBlockSpec, PageSurfaceBlockSpec,
PageSurfaceRefBlockSpec,
...SurfaceBlockAdapterExtensions, ...SurfaceBlockAdapterExtensions,
].flat(); ].flat();
@@ -90,7 +85,6 @@ const PageFirstPartyBlockSpecs: ExtensionType[] = [
const EdgelessFirstPartyBlockSpecs: ExtensionType[] = [ const EdgelessFirstPartyBlockSpecs: ExtensionType[] = [
CommonBlockSpecs, CommonBlockSpecs,
EdgelessSurfaceBlockSpec, EdgelessSurfaceBlockSpec,
EdgelessSurfaceRefBlockSpec,
...EdgelessSurfaceBlockAdapterExtensions, ...EdgelessSurfaceBlockAdapterExtensions,
].flat(); ].flat();

View File

@@ -27,7 +27,6 @@ import {
} from '@blocksuite/affine-inline-preset'; } from '@blocksuite/affine-inline-preset';
import { import {
RootBlockSchemaExtension, RootBlockSchemaExtension,
SurfaceRefBlockSchemaExtension,
TableBlockSchemaExtension, TableBlockSchemaExtension,
TranscriptionBlockSchemaExtension, TranscriptionBlockSchemaExtension,
} from '@blocksuite/affine-model'; } from '@blocksuite/affine-model';
@@ -115,7 +114,6 @@ function getPlainTextAdapterExtensions(): ExtensionType[] {
const MigratingStoreExtensions: ExtensionType[] = [ const MigratingStoreExtensions: ExtensionType[] = [
RootBlockSchemaExtension, RootBlockSchemaExtension,
SurfaceBlockSchemaExtension, SurfaceBlockSchemaExtension,
SurfaceRefBlockSchemaExtension,
TableBlockSchemaExtension, TableBlockSchemaExtension,
TranscriptionBlockSchemaExtension, TranscriptionBlockSchemaExtension,

View File

@@ -17,10 +17,7 @@ export class EdgelessTextViewExtension extends ViewExtensionProvider {
override setup(context: ViewExtensionContext) { override setup(context: ViewExtensionContext) {
super.setup(context); super.setup(context);
const isEdgeless = const isEdgeless = this.isEdgeless(context.scope);
context.scope === 'edgeless' ||
context.scope === 'preview-edgeless' ||
context.scope === 'mobile-edgeless';
if (isEdgeless) { if (isEdgeless) {
context.register([ context.register([

View File

@@ -36,7 +36,9 @@
}, },
"exports": { "exports": {
".": "./src/index.ts", ".": "./src/index.ts",
"./effects": "./src/effects.ts" "./effects": "./src/effects.ts",
"./store": "./src/store.ts",
"./view": "./src/view.ts"
}, },
"files": [ "files": [
"src", "src",

View File

@@ -0,0 +1,14 @@
import {
type StoreExtensionContext,
StoreExtensionProvider,
} from '@blocksuite/affine-ext-loader';
import { SurfaceRefBlockSchemaExtension } from '@blocksuite/affine-model';
export class SurfaceRefStoreExtension extends StoreExtensionProvider {
override name = 'affine-surface-ref-block';
override setup(context: StoreExtensionContext) {
super.setup(context);
context.register(SurfaceRefBlockSchemaExtension);
}
}

View File

@@ -0,0 +1,49 @@
import {
type ViewExtensionContext,
ViewExtensionProvider,
} from '@blocksuite/affine-ext-loader';
import { SurfaceRefBlockSchema } from '@blocksuite/affine-model';
import { ToolbarModuleExtension } from '@blocksuite/affine-shared/services';
import {
BlockFlavourIdentifier,
BlockViewExtension,
FlavourExtension,
} from '@blocksuite/std';
import { literal } from 'lit/static-html.js';
import { SurfaceRefSlashMenuConfigExtension } from './configs/slash-menu';
import { surfaceRefToolbarModuleConfig } from './configs/toolbar';
import { effects } from './effects';
const flavour = SurfaceRefBlockSchema.model.flavour;
export class SurfaceRefViewExtension extends ViewExtensionProvider {
override name = 'affine-surface-ref-block';
override effect(): void {
super.effect();
effects();
}
override setup(context: ViewExtensionContext): void {
super.setup(context);
context.register([
FlavourExtension(flavour),
SurfaceRefSlashMenuConfigExtension,
]);
const isEdgeless = this.isEdgeless(context.scope);
if (isEdgeless) {
context.register([
BlockViewExtension(flavour, literal`affine-edgeless-surface-ref`),
]);
} else {
context.register([
BlockViewExtension(flavour, literal`affine-surface-ref`),
ToolbarModuleExtension({
id: BlockFlavourIdentifier(flavour),
config: surfaceRefToolbarModuleConfig,
}),
]);
}
}
}

View File

@@ -81,6 +81,19 @@ export class ViewExtensionProvider<
*/ */
effect(): void {} effect(): void {}
/**
* Check if the scope is edgeless
* @param scope - The scope to check
* @returns True if the scope is edgeless, false otherwise
*/
isEdgeless = (scope: ViewScope) => {
return (
scope === 'edgeless' ||
scope === 'preview-edgeless' ||
scope === 'mobile-edgeless'
);
};
override setup(context: ViewExtensionContext, options?: Options) { override setup(context: ViewExtensionContext, options?: Options) {
super.setup(context, options); super.setup(context, options);
const constructer = this.constructor as typeof ViewExtensionProvider; const constructer = this.constructor as typeof ViewExtensionProvider;

View File

@@ -13,6 +13,7 @@ import { LatexStoreExtension } from '@blocksuite/affine/blocks/latex/store';
import { ListStoreExtension } from '@blocksuite/affine/blocks/list/store'; import { ListStoreExtension } from '@blocksuite/affine/blocks/list/store';
import { NoteStoreExtension } from '@blocksuite/affine/blocks/note/store'; import { NoteStoreExtension } from '@blocksuite/affine/blocks/note/store';
import { ParagraphStoreExtension } from '@blocksuite/affine/blocks/paragraph/store'; import { ParagraphStoreExtension } from '@blocksuite/affine/blocks/paragraph/store';
import { SurfaceRefStoreExtension } from '@blocksuite/affine/blocks/surface-ref/store';
import { StoreExtensionManager } from '@blocksuite/affine/ext-loader'; import { StoreExtensionManager } from '@blocksuite/affine/ext-loader';
import { MigratingStoreExtension } from '@blocksuite/affine/extensions/store'; import { MigratingStoreExtension } from '@blocksuite/affine/extensions/store';
@@ -32,6 +33,7 @@ const manager = new StoreExtensionManager([
ListStoreExtension, ListStoreExtension,
NoteStoreExtension, NoteStoreExtension,
ParagraphStoreExtension, ParagraphStoreExtension,
SurfaceRefStoreExtension,
MigratingStoreExtension, MigratingStoreExtension,
]); ]);

View File

@@ -13,12 +13,14 @@ import { LatexViewExtension } from '@blocksuite/affine/blocks/latex/view';
import { ListViewExtension } from '@blocksuite/affine/blocks/list/view'; import { ListViewExtension } from '@blocksuite/affine/blocks/list/view';
import { NoteViewExtension } from '@blocksuite/affine/blocks/note/view'; import { NoteViewExtension } from '@blocksuite/affine/blocks/note/view';
import { ParagraphViewExtension } from '@blocksuite/affine/blocks/paragraph/view'; import { ParagraphViewExtension } from '@blocksuite/affine/blocks/paragraph/view';
import { SurfaceRefViewExtension } from '@blocksuite/affine/blocks/surface-ref/view';
import { ViewExtensionManager } from '@blocksuite/affine/ext-loader'; import { ViewExtensionManager } from '@blocksuite/affine/ext-loader';
import { MigratingViewExtension } from '@blocksuite/affine/extensions/view'; import { MigratingViewExtension } from '@blocksuite/affine/extensions/view';
export function getTestViewManager() { export function getTestViewManager() {
const manager = new ViewExtensionManager([ const manager = new ViewExtensionManager([
MigratingViewExtension, MigratingViewExtension,
AttachmentViewExtension, AttachmentViewExtension,
BookmarkViewExtension, BookmarkViewExtension,
CalloutViewExtension, CalloutViewExtension,
@@ -34,6 +36,7 @@ export function getTestViewManager() {
ListViewExtension, ListViewExtension,
NoteViewExtension, NoteViewExtension,
ParagraphViewExtension, ParagraphViewExtension,
SurfaceRefViewExtension,
]); ]);
return manager; return manager;
} }

View File

@@ -13,6 +13,7 @@ import { LatexStoreExtension } from '@blocksuite/affine/blocks/latex/store';
import { ListStoreExtension } from '@blocksuite/affine/blocks/list/store'; import { ListStoreExtension } from '@blocksuite/affine/blocks/list/store';
import { NoteStoreExtension } from '@blocksuite/affine/blocks/note/store'; import { NoteStoreExtension } from '@blocksuite/affine/blocks/note/store';
import { ParagraphStoreExtension } from '@blocksuite/affine/blocks/paragraph/store'; import { ParagraphStoreExtension } from '@blocksuite/affine/blocks/paragraph/store';
import { SurfaceRefStoreExtension } from '@blocksuite/affine/blocks/surface-ref/store';
import { import {
type StoreExtensionContext, type StoreExtensionContext,
StoreExtensionManager, StoreExtensionManager,
@@ -47,6 +48,7 @@ const manager = new StoreExtensionManager([
ListStoreExtension, ListStoreExtension,
NoteStoreExtension, NoteStoreExtension,
ParagraphStoreExtension, ParagraphStoreExtension,
SurfaceRefStoreExtension,
MigratingStoreExtension, MigratingStoreExtension,
MigratingAffineStoreExtension, MigratingAffineStoreExtension,

View File

@@ -15,6 +15,7 @@ import { ListViewExtension } from '@blocksuite/affine/blocks/list/view';
import { NoteViewExtension } from '@blocksuite/affine/blocks/note/view'; import { NoteViewExtension } from '@blocksuite/affine/blocks/note/view';
import { ParagraphBlockConfigExtension } from '@blocksuite/affine/blocks/paragraph'; import { ParagraphBlockConfigExtension } from '@blocksuite/affine/blocks/paragraph';
import { ParagraphViewExtension } from '@blocksuite/affine/blocks/paragraph/view'; import { ParagraphViewExtension } from '@blocksuite/affine/blocks/paragraph/view';
import { SurfaceRefViewExtension } from '@blocksuite/affine/blocks/surface-ref/view';
import { import {
type ViewExtensionContext, type ViewExtensionContext,
ViewExtensionManager, ViewExtensionManager,
@@ -160,6 +161,7 @@ const manager = new ViewExtensionManager([
ListViewExtension, ListViewExtension,
NoteViewExtension, NoteViewExtension,
ParagraphViewExtension, ParagraphViewExtension,
SurfaceRefViewExtension,
MigratingAffineViewExtension, MigratingAffineViewExtension,
]); ]);

View File

@@ -1,38 +0,0 @@
import { AttachmentStoreExtension } from '@blocksuite/affine/blocks/attachment/store';
import { BookmarkStoreExtension } from '@blocksuite/affine/blocks/bookmark/store';
import { CalloutStoreExtension } from '@blocksuite/affine/blocks/callout/store';
import { CodeStoreExtension } from '@blocksuite/affine/blocks/code/store';
import { DataViewStoreExtension } from '@blocksuite/affine/blocks/data-view/store';
import { DatabaseStoreExtension } from '@blocksuite/affine/blocks/database/store';
import { DividerStoreExtension } from '@blocksuite/affine/blocks/divider/store';
import { EdgelessTextStoreExtension } from '@blocksuite/affine/blocks/edgeless-text/store';
import { EmbedStoreExtension } from '@blocksuite/affine/blocks/embed/store';
import { FrameStoreExtension } from '@blocksuite/affine/blocks/frame/store';
import { ImageStoreExtension } from '@blocksuite/affine/blocks/image/store';
import { LatexStoreExtension } from '@blocksuite/affine/blocks/latex/store';
import { ListStoreExtension } from '@blocksuite/affine/blocks/list/store';
import { NoteStoreExtension } from '@blocksuite/affine/blocks/note/store';
import { ParagraphStoreExtension } from '@blocksuite/affine/blocks/paragraph/store';
import { StoreExtensionManager } from '@blocksuite/affine/ext-loader';
export function createStoreManager() {
const manager = new StoreExtensionManager([
AttachmentStoreExtension,
BookmarkStoreExtension,
CalloutStoreExtension,
CodeStoreExtension,
DataViewStoreExtension,
DatabaseStoreExtension,
DividerStoreExtension,
EdgelessTextStoreExtension,
EmbedStoreExtension,
FrameStoreExtension,
ImageStoreExtension,
LatexStoreExtension,
ListStoreExtension,
NoteStoreExtension,
ParagraphStoreExtension,
]);
return manager;
}

View File

@@ -1,38 +0,0 @@
import { AttachmentViewExtension } from '@blocksuite/affine/blocks/attachment/view';
import { BookmarkViewExtension } from '@blocksuite/affine/blocks/bookmark/view';
import { CalloutViewExtension } from '@blocksuite/affine/blocks/callout/view';
import { CodeBlockViewExtension } from '@blocksuite/affine/blocks/code/view';
import { DataViewViewExtension } from '@blocksuite/affine/blocks/data-view/view';
import { DatabaseViewExtension } from '@blocksuite/affine/blocks/database/view';
import { DividerViewExtension } from '@blocksuite/affine/blocks/divider/view';
import { EdgelessTextViewExtension } from '@blocksuite/affine/blocks/edgeless-text/view';
import { EmbedViewExtension } from '@blocksuite/affine/blocks/embed/view';
import { FrameViewExtension } from '@blocksuite/affine/blocks/frame/view';
import { ImageViewExtension } from '@blocksuite/affine/blocks/image/view';
import { LatexViewExtension } from '@blocksuite/affine/blocks/latex/view';
import { ListViewExtension } from '@blocksuite/affine/blocks/list/view';
import { NoteViewExtension } from '@blocksuite/affine/blocks/note/view';
import { ParagraphViewExtension } from '@blocksuite/affine/blocks/paragraph/view';
import { ViewExtensionManager } from '@blocksuite/affine/ext-loader';
export function createViewManager() {
const manager = new ViewExtensionManager([
AttachmentViewExtension,
BookmarkViewExtension,
CalloutViewExtension,
CodeBlockViewExtension,
DataViewViewExtension,
DatabaseViewExtension,
DividerViewExtension,
EdgelessTextViewExtension,
EmbedViewExtension,
FrameViewExtension,
ImageViewExtension,
LatexViewExtension,
ListViewExtension,
NoteViewExtension,
ParagraphViewExtension,
]);
return manager;
}