feat(editor): link inline extension (#11910)

Closes: BS-3216
This commit is contained in:
Saul-Mirone
2025-04-23 04:42:24 +00:00
parent 1b2030b36a
commit b1aecfc1c4
24 changed files with 72 additions and 20 deletions
+3 -1
View File
@@ -143,7 +143,9 @@
"./blocks/table/view": "./src/blocks/table/view.ts", "./blocks/table/view": "./src/blocks/table/view.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",
"./inlines/link": "./src/inlines/link.ts", "./inlines/link": "./src/inlines/link/index.ts",
"./inlines/link/store": "./src/inlines/link/store.ts",
"./inlines/link/view": "./src/inlines/link/view.ts",
"./inlines/reference": "./src/inlines/reference.ts", "./inlines/reference": "./src/inlines/reference.ts",
"./inlines/preset": "./src/inlines/preset.ts", "./inlines/preset": "./src/inlines/preset.ts",
"./inlines/footnote": "./src/inlines/footnote/index.ts", "./inlines/footnote": "./src/inlines/footnote/index.ts",
@@ -17,6 +17,7 @@ import { SurfaceRefStoreExtension } from '@blocksuite/affine-block-surface-ref/s
import { TableStoreExtension } from '@blocksuite/affine-block-table/store'; import { TableStoreExtension } from '@blocksuite/affine-block-table/store';
import { StoreExtensionManager } from '@blocksuite/affine-ext-loader'; import { StoreExtensionManager } from '@blocksuite/affine-ext-loader';
import { FootnoteStoreExtension } from '@blocksuite/affine-inline-footnote/store'; import { FootnoteStoreExtension } from '@blocksuite/affine-inline-footnote/store';
import { LinkStoreExtension } from '@blocksuite/affine-inline-link/store';
import { MigratingStoreExtension } from '../../extensions/store'; import { MigratingStoreExtension } from '../../extensions/store';
@@ -40,6 +41,7 @@ const manager = new StoreExtensionManager([
TableStoreExtension, TableStoreExtension,
FootnoteStoreExtension, FootnoteStoreExtension,
LinkStoreExtension,
MigratingStoreExtension, MigratingStoreExtension,
]); ]);
@@ -30,7 +30,6 @@ import { effects as fragmentDocTitleEffects } from '@blocksuite/affine-fragment-
import { effects as fragmentFramePanelEffects } from '@blocksuite/affine-fragment-frame-panel/effects'; import { effects as fragmentFramePanelEffects } from '@blocksuite/affine-fragment-frame-panel/effects';
import { effects as fragmentOutlineEffects } from '@blocksuite/affine-fragment-outline/effects'; import { effects as fragmentOutlineEffects } from '@blocksuite/affine-fragment-outline/effects';
import { effects as inlineLatexEffects } from '@blocksuite/affine-inline-latex/effects'; import { effects as inlineLatexEffects } from '@blocksuite/affine-inline-latex/effects';
import { effects as inlineLinkEffects } from '@blocksuite/affine-inline-link/effects';
import { effects as inlineMentionEffects } from '@blocksuite/affine-inline-mention'; import { effects as inlineMentionEffects } from '@blocksuite/affine-inline-mention';
import { effects as inlinePresetEffects } from '@blocksuite/affine-inline-preset/effects'; import { effects as inlinePresetEffects } from '@blocksuite/affine-inline-preset/effects';
import { effects as inlineReferenceEffects } from '@blocksuite/affine-inline-reference/effects'; import { effects as inlineReferenceEffects } from '@blocksuite/affine-inline-reference/effects';
@@ -53,7 +52,6 @@ export function effects() {
inlineReferenceEffects(); inlineReferenceEffects();
inlinePresetEffects(); inlinePresetEffects();
inlineLinkEffects();
inlineLatexEffects(); inlineLatexEffects();
inlineMentionEffects(); inlineMentionEffects();
@@ -0,0 +1 @@
export * from '@blocksuite/affine-inline-link/store';
@@ -0,0 +1 @@
export * from '@blocksuite/affine-inline-link/view';
+4 -1
View File
@@ -11,6 +11,7 @@
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@blocksuite/affine-components": "workspace:*", "@blocksuite/affine-components": "workspace:*",
"@blocksuite/affine-ext-loader": "workspace:*",
"@blocksuite/affine-inline-reference": "workspace:*", "@blocksuite/affine-inline-reference": "workspace:*",
"@blocksuite/affine-model": "workspace:*", "@blocksuite/affine-model": "workspace:*",
"@blocksuite/affine-shared": "workspace:*", "@blocksuite/affine-shared": "workspace:*",
@@ -34,7 +35,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",
@@ -0,0 +1,27 @@
import {
type StoreExtensionContext,
StoreExtensionProvider,
} from '@blocksuite/affine-ext-loader';
import {
htmlLinkElementToDeltaMatcher,
linkDeltaMarkdownAdapterMatch,
linkDeltaToHtmlAdapterMatcher,
linkDeltaToMarkdownAdapterMatcher,
markdownLinkToDeltaMatcher,
notionHtmlLinkElementToDeltaMatcher,
} from './adapters';
export class LinkStoreExtension extends StoreExtensionProvider {
override name = 'affine-link-inline';
override setup(context: StoreExtensionContext) {
super.setup(context);
context.register(linkDeltaMarkdownAdapterMatch);
context.register(linkDeltaToMarkdownAdapterMatcher);
context.register(notionHtmlLinkElementToDeltaMatcher);
context.register(markdownLinkToDeltaMatcher);
context.register(htmlLinkElementToDeltaMatcher);
context.register(linkDeltaToHtmlAdapterMatcher);
}
}
@@ -0,0 +1,23 @@
import {
type ViewExtensionContext,
ViewExtensionProvider,
} from '@blocksuite/affine-ext-loader';
import { effects } from './effects';
import { LinkInlineSpecExtension } from './inline-spec';
import { linkToolbar } from './toolbar';
export class LinkViewExtension extends ViewExtensionProvider {
override name = 'affine-link-inline';
override effect(): void {
super.effect();
effects();
}
override setup(context: ViewExtensionContext): void {
super.setup(context);
context.register(LinkInlineSpecExtension);
context.register(linkToolbar);
}
}
@@ -8,6 +8,7 @@
"include": ["./src"], "include": ["./src"],
"references": [ "references": [
{ "path": "../../components" }, { "path": "../../components" },
{ "path": "../../ext-loader" },
{ "path": "../reference" }, { "path": "../reference" },
{ "path": "../../model" }, { "path": "../../model" },
{ "path": "../../shared" }, { "path": "../../shared" },
@@ -1,4 +1,3 @@
import { htmlLinkElementToDeltaMatcher } from '@blocksuite/affine-inline-link';
import { import {
type HtmlAST, type HtmlAST,
HtmlASTToDeltaExtension, HtmlASTToDeltaExtension,
@@ -169,7 +168,6 @@ export const HtmlInlineToDeltaAdapterExtensions = [
htmlCodeElementToDeltaMatcher, htmlCodeElementToDeltaMatcher,
htmlDelElementToDeltaMatcher, htmlDelElementToDeltaMatcher,
htmlUnderlineElementToDeltaMatcher, htmlUnderlineElementToDeltaMatcher,
htmlLinkElementToDeltaMatcher,
htmlMarkElementToDeltaMatcher, htmlMarkElementToDeltaMatcher,
htmlBrElementToDeltaMatcher, htmlBrElementToDeltaMatcher,
]; ];
@@ -1,4 +1,3 @@
import { linkDeltaToHtmlAdapterMatcher } from '@blocksuite/affine-inline-link';
import { referenceDeltaToHtmlAdapterMatcher } from '@blocksuite/affine-inline-reference'; import { referenceDeltaToHtmlAdapterMatcher } from '@blocksuite/affine-inline-reference';
import type { InlineHtmlAST } from '@blocksuite/affine-shared/adapters'; import type { InlineHtmlAST } from '@blocksuite/affine-shared/adapters';
import { InlineDeltaToHtmlAdapterExtension } from '@blocksuite/affine-shared/adapters'; import { InlineDeltaToHtmlAdapterExtension } from '@blocksuite/affine-shared/adapters';
@@ -154,5 +153,4 @@ export const InlineDeltaToHtmlAdapterExtensions = [
highlightColorDeltaToHtmlAdapterMatcher, highlightColorDeltaToHtmlAdapterMatcher,
inlineCodeDeltaToHtmlAdapterMatcher, inlineCodeDeltaToHtmlAdapterMatcher,
referenceDeltaToHtmlAdapterMatcher, referenceDeltaToHtmlAdapterMatcher,
linkDeltaToHtmlAdapterMatcher,
]; ];
@@ -1,5 +1,4 @@
import { latexDeltaToMarkdownAdapterMatcher } from '@blocksuite/affine-inline-latex'; import { latexDeltaToMarkdownAdapterMatcher } from '@blocksuite/affine-inline-latex';
import { linkDeltaToMarkdownAdapterMatcher } from '@blocksuite/affine-inline-link';
import { referenceDeltaToMarkdownAdapterMatcher } from '@blocksuite/affine-inline-reference'; import { referenceDeltaToMarkdownAdapterMatcher } from '@blocksuite/affine-inline-reference';
import { InlineDeltaToMarkdownAdapterExtension } from '@blocksuite/affine-shared/adapters'; import { InlineDeltaToMarkdownAdapterExtension } from '@blocksuite/affine-shared/adapters';
@@ -54,7 +53,6 @@ export const inlineCodeDeltaToMarkdownAdapterMatcher =
export const InlineDeltaToMarkdownAdapterExtensions = [ export const InlineDeltaToMarkdownAdapterExtensions = [
referenceDeltaToMarkdownAdapterMatcher, referenceDeltaToMarkdownAdapterMatcher,
linkDeltaToMarkdownAdapterMatcher,
inlineCodeDeltaToMarkdownAdapterMatcher, inlineCodeDeltaToMarkdownAdapterMatcher,
boldDeltaToMarkdownAdapterMatcher, boldDeltaToMarkdownAdapterMatcher,
italicDeltaToMarkdownAdapterMatcher, italicDeltaToMarkdownAdapterMatcher,
@@ -1,5 +1,4 @@
import { markdownInlineMathToDeltaMatcher } from '@blocksuite/affine-inline-latex'; import { markdownInlineMathToDeltaMatcher } from '@blocksuite/affine-inline-latex';
import { markdownLinkToDeltaMatcher } from '@blocksuite/affine-inline-link';
import { MarkdownASTToDeltaExtension } from '@blocksuite/affine-shared/adapters'; import { MarkdownASTToDeltaExtension } from '@blocksuite/affine-shared/adapters';
export const markdownTextToDeltaMatcher = MarkdownASTToDeltaExtension({ export const markdownTextToDeltaMatcher = MarkdownASTToDeltaExtension({
@@ -95,7 +94,6 @@ export const MarkdownInlineToDeltaAdapterExtensions = [
markdownStrongToDeltaMatcher, markdownStrongToDeltaMatcher,
markdownEmphasisToDeltaMatcher, markdownEmphasisToDeltaMatcher,
markdownDeleteToDeltaMatcher, markdownDeleteToDeltaMatcher,
markdownLinkToDeltaMatcher,
markdownInlineMathToDeltaMatcher, markdownInlineMathToDeltaMatcher,
markdownListToDeltaMatcher, markdownListToDeltaMatcher,
markdownHtmlToDeltaMatcher, markdownHtmlToDeltaMatcher,
@@ -1,4 +1,3 @@
import { notionHtmlLinkElementToDeltaMatcher } from '@blocksuite/affine-inline-link';
import { import {
HastUtils, HastUtils,
type HtmlAST, type HtmlAST,
@@ -249,7 +248,6 @@ export const NotionHtmlInlineToDeltaAdapterExtensions: ExtensionType[] = [
notionHtmlCodeElementToDeltaMatcher, notionHtmlCodeElementToDeltaMatcher,
notionHtmlDelElementToDeltaMatcher, notionHtmlDelElementToDeltaMatcher,
notionHtmlUnderlineElementToDeltaMatcher, notionHtmlUnderlineElementToDeltaMatcher,
notionHtmlLinkElementToDeltaMatcher,
notionHtmlMarkElementToDeltaMatcher, notionHtmlMarkElementToDeltaMatcher,
notionHtmlListToDeltaMatcher, notionHtmlListToDeltaMatcher,
notionHtmlLiElementToDeltaMatcher, notionHtmlLiElementToDeltaMatcher,
@@ -1,10 +1,8 @@
import { latexDeltaMarkdownAdapterMatch } from '@blocksuite/affine-inline-latex'; import { latexDeltaMarkdownAdapterMatch } from '@blocksuite/affine-inline-latex';
import { linkDeltaMarkdownAdapterMatch } from '@blocksuite/affine-inline-link';
import { referenceDeltaMarkdownAdapterMatch } from '@blocksuite/affine-inline-reference'; import { referenceDeltaMarkdownAdapterMatch } from '@blocksuite/affine-inline-reference';
import type { ExtensionType } from '@blocksuite/store'; import type { ExtensionType } from '@blocksuite/store';
export const InlineDeltaToPlainTextAdapterExtensions: ExtensionType[] = [ export const InlineDeltaToPlainTextAdapterExtensions: ExtensionType[] = [
referenceDeltaMarkdownAdapterMatch, referenceDeltaMarkdownAdapterMatch,
linkDeltaMarkdownAdapterMatch,
latexDeltaMarkdownAdapterMatch, latexDeltaMarkdownAdapterMatch,
]; ];
@@ -1,5 +1,4 @@
import { inlineLatexExtensions } from '@blocksuite/affine-inline-latex'; import { inlineLatexExtensions } from '@blocksuite/affine-inline-latex';
import { inlineLinkExtensions } from '@blocksuite/affine-inline-link';
import { inlineMentionExtensions } from '@blocksuite/affine-inline-mention'; import { inlineMentionExtensions } from '@blocksuite/affine-inline-mention';
import { inlineReferenceExtensions } from '@blocksuite/affine-inline-reference'; import { inlineReferenceExtensions } from '@blocksuite/affine-inline-reference';
import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
@@ -105,7 +104,6 @@ export const InlineSpecExtensions: ExtensionType[] = [
CodeInlineSpecExtension, CodeInlineSpecExtension,
BackgroundInlineSpecExtension, BackgroundInlineSpecExtension,
ColorInlineSpecExtension, ColorInlineSpecExtension,
...inlineLinkExtensions,
...inlineReferenceExtensions, ...inlineReferenceExtensions,
...inlineLatexExtensions, ...inlineLatexExtensions,
...inlineMentionExtensions, ...inlineMentionExtensions,
@@ -1,5 +1,4 @@
import { LatexExtension } from '@blocksuite/affine-inline-latex'; import { LatexExtension } from '@blocksuite/affine-inline-latex';
import { LinkExtension } from '@blocksuite/affine-inline-link';
import type { AffineTextAttributes } from '@blocksuite/affine-shared/types'; import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
import { InlineMarkdownExtension } from '@blocksuite/std/inline'; import { InlineMarkdownExtension } from '@blocksuite/std/inline';
import type { ExtensionType } from '@blocksuite/store'; import type { ExtensionType } from '@blocksuite/store';
@@ -371,6 +370,5 @@ export const MarkdownExtensions: ExtensionType[] = [
StrikethroughExtension, StrikethroughExtension,
UnderthroughExtension, UnderthroughExtension,
CodeExtension, CodeExtension,
LinkExtension,
LatexExtension, LatexExtension,
]; ];
+2
View File
@@ -18,6 +18,7 @@ import { TableStoreExtension } from '@blocksuite/affine/blocks/table/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';
import { FootnoteStoreExtension } from '@blocksuite/affine/inlines/footnote/store'; import { FootnoteStoreExtension } from '@blocksuite/affine/inlines/footnote/store';
import { LinkStoreExtension } from '@blocksuite/affine/inlines/link/store';
const manager = new StoreExtensionManager([ const manager = new StoreExtensionManager([
AttachmentStoreExtension, AttachmentStoreExtension,
@@ -39,6 +40,7 @@ const manager = new StoreExtensionManager([
TableStoreExtension, TableStoreExtension,
FootnoteStoreExtension, FootnoteStoreExtension,
LinkStoreExtension,
MigratingStoreExtension, MigratingStoreExtension,
]); ]);
+2
View File
@@ -18,6 +18,7 @@ import { TableViewExtension } from '@blocksuite/affine/blocks/table/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';
import { FootnoteViewExtension } from '@blocksuite/affine/inlines/footnote/view'; import { FootnoteViewExtension } from '@blocksuite/affine/inlines/footnote/view';
import { LinkViewExtension } from '@blocksuite/affine/inlines/link/view';
export function getTestViewManager() { export function getTestViewManager() {
const manager = new ViewExtensionManager([ const manager = new ViewExtensionManager([
@@ -44,6 +45,7 @@ export function getTestViewManager() {
// Inline // Inline
FootnoteViewExtension, FootnoteViewExtension,
LinkViewExtension,
]); ]);
return manager; return manager;
} }
@@ -22,6 +22,7 @@ import {
} from '@blocksuite/affine/ext-loader'; } from '@blocksuite/affine/ext-loader';
import { MigratingStoreExtension } from '@blocksuite/affine/extensions/store'; import { MigratingStoreExtension } from '@blocksuite/affine/extensions/store';
import { FootnoteStoreExtension } from '@blocksuite/affine/inlines/footnote/store'; import { FootnoteStoreExtension } from '@blocksuite/affine/inlines/footnote/store';
import { LinkStoreExtension } from '@blocksuite/affine/inlines/link/store';
import { AIChatBlockSchemaExtension } from '../ai/blocks/ai-chat-block/model'; import { AIChatBlockSchemaExtension } from '../ai/blocks/ai-chat-block/model';
@@ -55,6 +56,7 @@ const manager = new StoreExtensionManager([
TableStoreExtension, TableStoreExtension,
// Inline // Inline
FootnoteStoreExtension, FootnoteStoreExtension,
LinkStoreExtension,
MigratingStoreExtension, MigratingStoreExtension,
MigratingAffineStoreExtension, MigratingAffineStoreExtension,
@@ -24,6 +24,7 @@ import {
} from '@blocksuite/affine/ext-loader'; } from '@blocksuite/affine/ext-loader';
import { MigratingViewExtension } from '@blocksuite/affine/extensions/view'; import { MigratingViewExtension } from '@blocksuite/affine/extensions/view';
import { FootnoteViewExtension } from '@blocksuite/affine/inlines/footnote/view'; import { FootnoteViewExtension } from '@blocksuite/affine/inlines/footnote/view';
import { LinkViewExtension } from '@blocksuite/affine/inlines/link/view';
import { ToolbarModuleExtension } from '@blocksuite/affine/shared/services'; import { ToolbarModuleExtension } from '@blocksuite/affine/shared/services';
import { BlockFlavourIdentifier } from '@blocksuite/affine/std'; import { BlockFlavourIdentifier } from '@blocksuite/affine/std';
import { FrameworkProvider } from '@toeverything/infra'; import { FrameworkProvider } from '@toeverything/infra';
@@ -168,6 +169,7 @@ const manager = new ViewExtensionManager([
TableViewExtension, TableViewExtension,
// Inline // Inline
FootnoteViewExtension, FootnoteViewExtension,
LinkViewExtension,
MigratingAffineViewExtension, MigratingAffineViewExtension,
]); ]);
+1
View File
@@ -666,6 +666,7 @@ export const PackageList = [
name: '@blocksuite/affine-inline-link', name: '@blocksuite/affine-inline-link',
workspaceDependencies: [ workspaceDependencies: [
'blocksuite/affine/components', 'blocksuite/affine/components',
'blocksuite/affine/ext-loader',
'blocksuite/affine/inlines/reference', 'blocksuite/affine/inlines/reference',
'blocksuite/affine/model', 'blocksuite/affine/model',
'blocksuite/affine/shared', 'blocksuite/affine/shared',
+1
View File
@@ -3388,6 +3388,7 @@ __metadata:
resolution: "@blocksuite/affine-inline-link@workspace:blocksuite/affine/inlines/link" resolution: "@blocksuite/affine-inline-link@workspace:blocksuite/affine/inlines/link"
dependencies: dependencies:
"@blocksuite/affine-components": "workspace:*" "@blocksuite/affine-components": "workspace:*"
"@blocksuite/affine-ext-loader": "workspace:*"
"@blocksuite/affine-inline-reference": "workspace:*" "@blocksuite/affine-inline-reference": "workspace:*"
"@blocksuite/affine-model": "workspace:*" "@blocksuite/affine-model": "workspace:*"
"@blocksuite/affine-shared": "workspace:*" "@blocksuite/affine-shared": "workspace:*"