refactor(editor): use add and delete impl move block

.docker/selfhost/schema.json

@@ -886,8 +886,8 @@
       "properties": {
         "enabled": {
           "type": "boolean",
-          "description": "Enable indexer plugin\n@default false\n@environment `AFFINE_INDEXER_ENABLED`",
-          "default": false
+          "description": "Enable indexer plugin\n@default true\n@environment `AFFINE_INDEXER_ENABLED`",
+          "default": true
         },
         "provider.type": {
           "type": "string",

.github/helm/affine/charts/doc/templates/deployment.yaml

@@ -95,13 +95,11 @@ spec:
               path: /info
               port: http
             initialDelaySeconds: {{ .Values.probe.initialDelaySeconds }}
-            timeoutSeconds: {{ .Values.probe.timeoutSeconds }}
           readinessProbe:
             httpGet:
               path: /info
               port: http
             initialDelaySeconds: {{ .Values.probe.initialDelaySeconds }}
-            timeoutSeconds: {{ .Values.probe.timeoutSeconds }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}

.github/helm/affine/charts/doc/values.yaml

@@ -36,7 +36,6 @@ resources:
 
 probe:
   initialDelaySeconds: 20
-  timeoutSeconds: 5
 
 nodeSelector: {}
 tolerations: []

.github/workflows/build-images.yml

@@ -113,7 +113,6 @@ jobs:
   build-server-native:
     name: Build Server native - ${{ matrix.targets.name }}
     runs-on: ubuntu-latest
-    environment: ${{ github.event.inputs.flavor }}
     strategy:
       fail-fast: false
       matrix:

.github/workflows/build-test.yml

@@ -20,7 +20,6 @@ env:
   COVERAGE: true
   MACOSX_DEPLOYMENT_TARGET: '10.13'
   DEPLOYMENT_TYPE: affine
-  AFFINE_INDEXER_ENABLED: true
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -152,8 +151,7 @@ jobs:
       - name: Clippy
         run: |
           rustup component add clippy
-          cargo clippy --workspace --exclude affine_server_native --all-targets --all-features -- -D warnings
-          cargo clippy -p affine_server_native --all-targets --all-features -- -D warnings
+          cargo clippy --all-targets --all-features -- -D warnings
 
   check-git-status:
     name: Check Git Status
@@ -827,6 +825,7 @@ jobs:
       - optimize_ci
     if: needs.optimize_ci.outputs.skip == 'false'
     env:
+      RUSTFLAGS: -D warnings
       CARGO_TERM_COLOR: always
     steps:
       - uses: actions/checkout@v4
@@ -924,7 +923,7 @@ jobs:
         uses: taiki-e/install-action@nextest
 
       - name: Run tests
-        run: cargo nextest run --workspace --exclude affine_server_native --features use-as-lib --release --no-fail-fast
+        run: cargo nextest run --release --no-fail-fast
 
   copilot-api-test:
     name: Server Copilot Api Test

.github/workflows/release-mobile.yml

@@ -117,10 +117,31 @@ jobs:
           name: android
           path: packages/frontend/apps/android/dist
 
-  ios:
-    runs-on: ${{ github.ref_name == 'canary' && 'macos-latest' || 'blaze/macos-14' }}
+  determine-ios-runner:
+    runs-on: ubuntu-latest
     needs:
       - build-ios-web
+    outputs:
+      RUNNER: ${{ steps.runner.outputs.RUNNER }}
+    steps:
+      - name: Determine Runner
+        id: runner
+        # Randomly pick runner with 80% chance for blaze/macos-14 and 20% chance for namespace-profile-macos
+        # blaze/macos-14 is free but has limited concurrency
+        run: |
+          RANDOM_NUMBER=$(( $RANDOM % 100 + 1 ))
+          if [ $RANDOM_NUMBER -le 20 ]; then
+            echo "Selected namespace-profile-macos (20% probability)"
+            echo "RUNNER=namespace-profile-macos" >> $GITHUB_OUTPUT
+          else
+            echo "Selected blaze/macos-14 (80% probability)"
+            echo "RUNNER=blaze/macos-14" >> $GITHUB_OUTPUT
+          fi
+
+  ios:
+    runs-on: ${{ github.ref_name == 'canary' && 'macos-latest' || needs.determine-ios-runner.outputs.RUNNER }}
+    needs:
+      - determine-ios-runner
     steps:
       - uses: actions/checkout@v4
       - name: Download mobile artifact

Cargo.toml

@@ -47,9 +47,9 @@ log                    = "0.4"
 loom                   = { version = "0.7", features = ["checkpoint"] }
 mimalloc               = "0.1"
 nanoid                 = "0.4"
-napi                   = { version = "3.0.0-beta.3", features = ["async", "chrono_date", "error_anyhow", "napi9", "serde"] }
+napi                   = { version = "3.0.0-alpha.31", features = ["async", "chrono_date", "error_anyhow", "napi9", "serde"] }
 napi-build             = { version = "2" }
-napi-derive            = { version = "3.0.0-beta.3" }
+napi-derive            = { version = "3.0.0-alpha.28" }
 nom                    = "8"
 notify                 = { version = "8", features = ["serde"] }
 objc2                  = "0.6"
@@ -77,12 +77,12 @@ smol_str               = "0.3"
 sqlx                   = { version = "0.8", default-features = false, features = ["chrono", "macros", "migrate", "runtime-tokio", "sqlite", "tls-rustls"] }
 strum_macros           = "0.27.0"
 symphonia              = { version = "0.5", features = ["all", "opt-simd"] }
-text-splitter          = "0.27"
+text-splitter          = "0.25"
 thiserror              = "2"
-tiktoken-rs            = "0.7"
-tokio                  = "1.45"
+tiktoken-rs            = "0.6"
+tokio                  = "1.37"
 tree-sitter            = { version = "0.25" }
-tree-sitter-c          = { version = "0.24" }
+tree-sitter-c          = { version = "0.23" }
 tree-sitter-c-sharp    = { version = "0.23" }
 tree-sitter-cpp        = { version = "0.23" }
 tree-sitter-go         = { version = "0.23" }

blocksuite/affine/blocks/attachment/src/attachment-block.ts

@@ -17,15 +17,11 @@ import {
   AttachmentBlockStyles,
 } from '@blocksuite/affine-model';
 import {
-  CitationProvider,
   DocModeProvider,
   FileSizeLimitProvider,
   TelemetryProvider,
 } from '@blocksuite/affine-shared/services';
-import {
-  formatSize,
-  openSingleFileWith,
-} from '@blocksuite/affine-shared/utils';
+import { formatSize } from '@blocksuite/affine-shared/utils';
 import {
   AttachmentIcon,
   ResetIcon,
@@ -34,18 +30,17 @@ import {
 } from '@blocksuite/icons/lit';
 import { BlockSelection } from '@blocksuite/std';
 import { nanoid, Slice } from '@blocksuite/store';
-import { batch, computed, signal } from '@preact/signals-core';
+import { computed, signal } from '@preact/signals-core';
 import { html, type TemplateResult } from 'lit';
 import { choose } from 'lit/directives/choose.js';
 import { type ClassInfo, classMap } from 'lit/directives/class-map.js';
 import { guard } from 'lit/directives/guard.js';
 import { styleMap } from 'lit/directives/style-map.js';
 import { when } from 'lit/directives/when.js';
-import { filter } from 'rxjs/operators';
 
 import { AttachmentEmbedProvider } from './embed';
 import { styles } from './styles';
-import { downloadAttachmentBlob, getFileType, refreshData } from './utils';
+import { downloadAttachmentBlob, refreshData } from './utils';
 
 type AttachmentResolvedStateInfo = ResolvedStateInfo & {
   kind?: TemplateResult;
@@ -84,12 +79,8 @@ export class AttachmentBlockComponent extends CaptionedBlockComponent<Attachment
     return this.std.get(FileSizeLimitProvider).maxFileSize;
   }
 
-  get citationService() {
-    return this.std.get(CitationProvider);
-  }
-
   get isCitation() {
-    return this.citationService.isCitationModel(this.model);
+    return !!this.model.props.footnoteIdentifier;
   }
 
   convertTo = () => {
@@ -132,50 +123,12 @@ export class AttachmentBlockComponent extends CaptionedBlockComponent<Attachment
 
   // Refreshes the embed component.
   reload = () => {
-    batch(() => {
-      if (this.model.props.embed$.value) {
-        this._refreshKey$.value = nanoid();
-        return;
-      }
+    if (this.model.props.embed) {
+      this._refreshKey$.value = nanoid();
+      return;
+    }
 
-      this.refreshData();
-    });
-  };
-
-  // Replaces the current attachment.
-  replace = async () => {
-    const state = this.resourceController.state$.peek();
-    if (state.uploading) return;
-
-    const file = await openSingleFileWith();
-    if (!file) return;
-
-    const sourceId = await this.std.store.blobSync.set(file);
-    const type = await getFileType(file);
-    const { name, size } = file;
-
-    let embed = this.model.props.embed$.value ?? false;
-
-    this.std.store.captureSync();
-    this.std.store.transact(() => {
-      this.std.store.updateBlock(this.blockId, {
-        name,
-        size,
-        type,
-        sourceId,
-        embed: false,
-      });
-
-      const provider = this.std.get(AttachmentEmbedProvider);
-      embed &&= provider.embedded(this.model);
-
-      if (embed) {
-        provider.convertTo(this.model);
-      }
-
-      // Reloads
-      this.reload();
-    });
+    this.refreshData();
   };
 
   private _selectBlock() {
@@ -186,34 +139,6 @@ export class AttachmentBlockComponent extends CaptionedBlockComponent<Attachment
     selectionManager.setGroup('note', [blockSelection]);
   }
 
-  private readonly _trackCitationDeleteEvent = () => {
-    // Check citation delete event
-    this._disposables.add(
-      this.std.store.slots.blockUpdated
-        .pipe(
-          filter(payload => {
-            if (!payload.isLocal) return false;
-
-            const { flavour, id, type } = payload;
-            if (
-              type !== 'delete' ||
-              flavour !== this.model.flavour ||
-              id !== this.model.id
-            )
-              return false;
-
-            const { model } = payload;
-            if (!this.citationService.isCitationModel(model)) return false;
-
-            return true;
-          })
-        )
-        .subscribe(() => {
-          this.citationService.trackEvent('Delete');
-        })
-    );
-  };
-
   override connectedCallback() {
     super.connectedCallback();
 
@@ -237,8 +162,6 @@ export class AttachmentBlockComponent extends CaptionedBlockComponent<Attachment
         });
       });
     }
-
-    this._trackCitationDeleteEvent();
   }
 
   override firstUpdated() {
@@ -444,7 +367,7 @@ export class AttachmentBlockComponent extends CaptionedBlockComponent<Attachment
 
   protected renderEmbedView = () => {
     const { model, blobUrl } = this;
-    if (!model.props.embed$.value || !blobUrl) return null;
+    if (!model.props.embed || !blobUrl) return null;
 
     const { std, _maxFileSize } = this;
     const provider = std.get(AttachmentEmbedProvider);

blocksuite/affine/blocks/attachment/src/components/rename-model.ts

@@ -1,7 +1,6 @@
 import { ConfirmIcon } from '@blocksuite/affine-components/icons';
 import { toast } from '@blocksuite/affine-components/toast';
 import type { AttachmentBlockModel } from '@blocksuite/affine-model';
-import { CitationProvider } from '@blocksuite/affine-shared/services';
 import type { EditorHost } from '@blocksuite/std';
 import { html } from 'lit';
 import { createRef, ref } from 'lit/directives/ref.js';
@@ -34,7 +33,6 @@ export const RenameModal = ({
 
   let fileName = includeExtension ? nameWithoutExtension : originalName;
   const extension = includeExtension ? originalExtension : '';
-  const citationService = editorHost.std.get(CitationProvider);
 
   const abort = () => abortController.abort();
   const onConfirm = () => {
@@ -46,9 +44,6 @@ export const RenameModal = ({
     model.store.updateBlock(model, {
       name: newFileName,
     });
-    if (citationService.isCitationModel(model)) {
-      citationService.trackEvent('Edit');
-    }
     abort();
   };
   const onInput = (e: InputEvent) => {

blocksuite/affine/blocks/attachment/src/configs/toolbar.ts

@@ -24,7 +24,6 @@ import {
   DownloadIcon,
   DuplicateIcon,
   EditIcon,
-  ReplaceIcon,
   ResetIcon,
 } from '@blocksuite/icons/lit';
 import { BlockFlavourIdentifier } from '@blocksuite/std';
@@ -140,42 +139,27 @@ export const attachmentViewDropdownMenu = {
       });
     };
 
-    return html`<affine-view-dropdown-menu
-      @toggle=${onToggle}
-      .actions=${actions.value}
-      .context=${ctx}
-      .viewType$=${viewType$}
-    ></affine-view-dropdown-menu>`;
+    return html`${keyed(
+      model,
+      html`<affine-view-dropdown-menu
+        @toggle=${onToggle}
+        .actions=${actions.value}
+        .context=${ctx}
+        .viewType$=${viewType$}
+      ></affine-view-dropdown-menu>`
+    )}`;
   },
 } as const satisfies ToolbarActionGroup<ToolbarAction>;
 
-const replaceAction = {
-  id: 'c.replace',
-  tooltip: 'Replace attachment',
-  icon: ReplaceIcon(),
-  disabled(ctx) {
-    const block = ctx.getCurrentBlockByType(AttachmentBlockComponent);
-    if (!block) return true;
-
-    const { downloading = false, uploading = false } =
-      block.resourceController.state$.value;
-    return downloading || uploading;
-  },
-  run(ctx) {
-    const block = ctx.getCurrentBlockByType(AttachmentBlockComponent);
-    block?.replace().catch(console.error);
-  },
-} as const satisfies ToolbarAction;
-
 const downloadAction = {
-  id: 'd.download',
+  id: 'c.download',
   tooltip: 'Download',
   icon: DownloadIcon(),
   run(ctx) {
     const block = ctx.getCurrentBlockByType(AttachmentBlockComponent);
     block?.download();
   },
-  when(ctx) {
+  when: ctx => {
     const model = ctx.getCurrentModelByType(AttachmentBlockModel);
     if (!model) return false;
     // Current citation attachment block does not support download
@@ -184,7 +168,7 @@ const downloadAction = {
 } as const satisfies ToolbarAction;
 
 const captionAction = {
-  id: 'e.caption',
+  id: 'd.caption',
   tooltip: 'Caption',
   icon: CaptionIcon(),
   run(ctx) {
@@ -237,7 +221,6 @@ const builtinToolbarConfig = {
       },
     },
     attachmentViewDropdownMenu,
-    replaceAction,
     downloadAction,
     captionAction,
     {
@@ -371,17 +354,13 @@ const builtinSurfaceToolbarConfig = {
         )}`;
       },
     } satisfies ToolbarActionGroup<ToolbarAction>,
-    {
-      ...replaceAction,
-      id: 'd.replace',
-    },
     {
       ...downloadAction,
-      id: 'e.download',
+      id: 'd.download',
     },
     {
       ...captionAction,
-      id: 'f.caption',
+      id: 'e.caption',
     },
   ],
   when: ctx => ctx.getSurfaceModelsByType(AttachmentBlockModel).length === 1,

blocksuite/affine/blocks/bookmark/src/bookmark-block.ts

@@ -8,7 +8,6 @@ import type {
 } from '@blocksuite/affine-model';
 import { ImageProxyService } from '@blocksuite/affine-shared/adapters';
 import {
-  CitationProvider,
   DocModeProvider,
   LinkPreviewServiceIdentifier,
 } from '@blocksuite/affine-shared/services';
@@ -19,7 +18,6 @@ import { html } from 'lit';
 import { property, query } from 'lit/decorators.js';
 import { type ClassInfo, classMap } from 'lit/directives/class-map.js';
 import { type StyleInfo, styleMap } from 'lit/directives/style-map.js';
-import { filter } from 'rxjs/operators';
 
 import { refreshBookmarkUrlData } from './utils.js';
 
@@ -116,12 +114,11 @@ export class BookmarkBlockComponent extends CaptionedBlockComponent<BookmarkBloc
     );
   };
 
-  get citationService() {
-    return this.std.get(CitationProvider);
-  }
-
   get isCitation() {
-    return this.citationService.isCitationModel(this.model);
+    return (
+      !!this.model.props.footnoteIdentifier &&
+      this.model.props.style === 'citation'
+    );
   }
 
   get imageProxyService() {
@@ -169,31 +166,6 @@ export class BookmarkBlockComponent extends CaptionedBlockComponent<BookmarkBloc
     ></bookmark-card>`;
   };
 
-  private readonly _trackCitationDeleteEvent = () => {
-    // Check citation delete event
-    this._disposables.add(
-      this.std.store.slots.blockUpdated
-        .pipe(
-          filter(payload => {
-            if (!payload.isLocal) return false;
-            const { flavour, id, type } = payload;
-            if (
-              type !== 'delete' ||
-              flavour !== this.model.flavour ||
-              id !== this.model.id
-            )
-              return false;
-            const { model } = payload;
-            if (!this.citationService.isCitationModel(model)) return false;
-            return true;
-          })
-        )
-        .subscribe(() => {
-          this.citationService.trackEvent('Delete');
-        })
-    );
-  };
-
   override connectedCallback() {
     super.connectedCallback();
 
@@ -231,8 +203,6 @@ export class BookmarkBlockComponent extends CaptionedBlockComponent<BookmarkBloc
         }
       })
     );
-
-    this._trackCitationDeleteEvent();
   }
 
   override disconnectedCallback(): void {

blocksuite/affine/blocks/bookmark/src/configs/toolbar.ts

@@ -407,7 +407,7 @@ const builtinSurfaceToolbarConfig = {
               if (options?.viewType !== 'embed') return;
 
               const { flavour, styles } = options;
-              let style: EmbedCardStyle = model.props.style;
+              let { style } = model.props;
 
               if (!styles.includes(style)) {
                 style = styles[0];
@@ -482,26 +482,24 @@ const builtinSurfaceToolbarConfig = {
     } satisfies ToolbarActionGroup<ToolbarAction>,
     {
       id: 'b.style',
-      actions: (
-        [
-          {
-            id: 'horizontal',
-            label: 'Large horizontal style',
-          },
-          {
-            id: 'list',
-            label: 'Small horizontal style',
-          },
-          {
-            id: 'vertical',
-            label: 'Large vertical style',
-          },
-          {
-            id: 'cube',
-            label: 'Small vertical style',
-          },
-        ] as const
-      ).filter(action => BookmarkStyles.includes(action.id)),
+      actions: [
+        {
+          id: 'horizontal',
+          label: 'Large horizontal style',
+        },
+        {
+          id: 'list',
+          label: 'Small horizontal style',
+        },
+        {
+          id: 'vertical',
+          label: 'Large vertical style',
+        },
+        {
+          id: 'cube',
+          label: 'Small vertical style',
+        },
+      ].filter(action => BookmarkStyles.includes(action.id as EmbedCardStyle)),
       content(ctx) {
         const model = ctx.getCurrentModelByType(BookmarkBlockModel);
         if (!model) return null;

blocksuite/affine/blocks/code/src/code-block.ts

@@ -40,16 +40,6 @@ export class CodeBlockComponent extends CaptionedBlockComponent<CodeBlockModel>
 
   private _inlineRangeProvider: InlineRangeProvider | null = null;
 
-  private readonly _localPreview$ = signal<boolean | null>(null);
-
-  preview$: Signal<boolean> = computed(() => {
-    const modelPreview = !!this.model.props.preview$.value;
-    if (this.store.readonly) {
-      return this._localPreview$.value ?? modelPreview;
-    }
-    return modelPreview;
-  });
-
   highlightTokens$: Signal<ThemedToken[][]> = signal([]);
 
   languageName$: Signal<string> = computed(() => {
@@ -403,7 +393,7 @@ export class CodeBlockComponent extends CaptionedBlockComponent<CodeBlockModel>
         true) &&
       (this.model.props.lineNumber ?? true);
 
-    const preview = this.preview$.value;
+    const preview = !!this.model.props.preview;
     const previewContext = this.std.getOptional(
       CodeBlockPreviewIdentifier(this.model.props.language ?? '')
     );
@@ -471,14 +461,6 @@ export class CodeBlockComponent extends CaptionedBlockComponent<CodeBlockModel>
   override accessor useCaptionEditor = true;
 
   override accessor useZeroWidth = true;
-
-  setPreviewState(preview: boolean) {
-    if (this.store.readonly) {
-      this._localPreview$.value = preview;
-    } else {
-      this.store.updateBlock(this.model, { preview });
-    }
-  }
 }
 
 declare global {

blocksuite/affine/blocks/code/src/code-toolbar/components/preview-button.ts

@@ -58,7 +58,11 @@ export class PreviewButton extends WithDisposable(SignalWatcher(LitElement)) {
   `;
 
   private readonly _toggle = (value: boolean) => {
-    this.blockComponent.setPreviewState(value);
+    if (this.blockComponent.store.readonly) return;
+
+    this.blockComponent.store.updateBlock(this.blockComponent.model, {
+      preview: value,
+    });
 
     const std = this.blockComponent.std;
     const mode = std.getOptional(DocModeProvider)?.getEditorMode() ?? 'page';
@@ -73,7 +77,7 @@ export class PreviewButton extends WithDisposable(SignalWatcher(LitElement)) {
   };
 
   get preview() {
-    return this.blockComponent.preview$.value;
+    return !!this.blockComponent.model.props.preview$.value;
   }
 
   override render() {

blocksuite/affine/blocks/code/src/markdown.ts

@@ -1,61 +0,0 @@
-import {
-  type CodeBlockModel,
-  CodeBlockSchema,
-  ParagraphBlockModel,
-} from '@blocksuite/affine-model';
-import { focusTextModel } from '@blocksuite/affine-rich-text';
-import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
-import { matchModels } from '@blocksuite/affine-shared/utils';
-import type { BlockComponent } from '@blocksuite/std';
-import { InlineMarkdownExtension } from '@blocksuite/std/inline';
-
-export const CodeBlockMarkdownExtension =
-  InlineMarkdownExtension<AffineTextAttributes>({
-    name: 'code-block',
-    pattern: /^```([a-zA-Z0-9]*)\s$/,
-    action: ({ inlineEditor, inlineRange, prefixText, pattern }) => {
-      if (inlineEditor.yTextString.slice(0, inlineRange.index).includes('\n')) {
-        return;
-      }
-
-      const match = prefixText.match(pattern);
-      if (!match) return;
-
-      const language = match[1];
-
-      if (!inlineEditor.rootElement) return;
-      const blockComponent =
-        inlineEditor.rootElement.closest<BlockComponent>('[data-block-id]');
-      if (!blockComponent) return;
-
-      const { model, std, store } = blockComponent;
-
-      if (
-        matchModels(model, [ParagraphBlockModel]) &&
-        model.props.type === 'quote'
-      ) {
-        return;
-      }
-
-      const parent = store.getParent(model);
-      if (!parent) return;
-      const index = parent.children.indexOf(model);
-
-      store.captureSync();
-      const codeId = store.addBlock<CodeBlockModel>(
-        CodeBlockSchema.model.flavour,
-        { language },
-        parent,
-        index
-      );
-
-      if (model.text && model.text.length > prefixText.length) {
-        const text = model.text.clone();
-        store.addBlock('affine:paragraph', { text }, parent, index + 1);
-        text.delete(0, prefixText.length);
-      }
-      store.deleteBlock(model, { bringChildrenTo: parent });
-
-      focusTextModel(std, codeId);
-    },
-  });

blocksuite/affine/blocks/code/src/styles.ts

@@ -33,10 +33,6 @@ export const codeBlockStyles = css`
     grid-template-columns: auto minmax(0, 1fr);
   }
 
-  .affine-code-block-container.disable-line-numbers v-line {
-    grid-template-columns: unset;
-  }
-
   .affine-code-block-container div:has(> v-line) {
     display: grid;
   }

blocksuite/affine/blocks/code/src/view.ts

@@ -21,7 +21,6 @@ import { CodeKeymapExtension } from './code-keymap.js';
 import { AFFINE_CODE_TOOLBAR_WIDGET } from './code-toolbar/index.js';
 import { codeSlashMenuConfig } from './configs/slash-menu.js';
 import { effects } from './effects.js';
-import { CodeBlockMarkdownExtension } from './markdown.js';
 
 const codeToolbarWidget = WidgetViewExtension(
   'affine:code',
@@ -45,7 +44,6 @@ export class CodeBlockViewExtension extends ViewExtensionProvider {
       BlockViewExtension('affine:code', literal`affine-code`),
       SlashMenuConfigExtension('affine:code', codeSlashMenuConfig),
       CodeKeymapExtension,
-      CodeBlockMarkdownExtension,
       ...getCodeClipboardExtensions(),
     ]);
     context.register([

blocksuite/affine/blocks/database/src/properties/rich-text/cell-renderer.ts

@@ -331,6 +331,7 @@ export class RichTextCell extends BaseCellRenderer<Text, string> {
         this.inlineEditor$.value?.selectAll();
       }
     };
+    this.addEventListener('keydown', selectAll);
     this.disposables.addFromEvent(this, 'keydown', selectAll);
     this.disposables.add(
       effect(() => {

blocksuite/affine/blocks/database/src/properties/title/text.ts

@@ -209,19 +209,10 @@ export class HeaderAreaTextCell extends BaseCellRenderer<Text, string> {
       }
     };
 
+    this.addEventListener('keydown', selectAll);
     this.disposables.addFromEvent(this, 'keydown', selectAll);
   }
 
-  private readonly _handleKeyDown = (event: KeyboardEvent) => {
-    if (event.key !== 'Escape') {
-      if (event.key === 'Tab') {
-        event.preventDefault();
-        return;
-      }
-      event.stopPropagation();
-    }
-  };
-
   override firstUpdated(props: Map<string, unknown>) {
     super.firstUpdated(props);
     this.richText.value?.updateComplete
@@ -242,12 +233,6 @@ export class HeaderAreaTextCell extends BaseCellRenderer<Text, string> {
             'paste',
             this._onPaste
           );
-          const inlineEditor = this.inlineEditor;
-          if (inlineEditor) {
-            this.disposables.add(
-              inlineEditor.slots.keydown.subscribe(this._handleKeyDown)
-            );
-          }
         }
       })
       .catch(console.error);

blocksuite/affine/blocks/divider/package.json

@@ -13,7 +13,6 @@
     "@blocksuite/affine-components": "workspace:*",
     "@blocksuite/affine-ext-loader": "workspace:*",
     "@blocksuite/affine-model": "workspace:*",
-    "@blocksuite/affine-rich-text": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/global": "workspace:*",
     "@blocksuite/std": "workspace:*",

blocksuite/affine/blocks/divider/src/markdown.ts

@@ -1,63 +0,0 @@
-import {
-  type DividerBlockModel,
-  DividerBlockSchema,
-  ParagraphBlockModel,
-  ParagraphBlockSchema,
-} from '@blocksuite/affine-model';
-import { focusTextModel } from '@blocksuite/affine-rich-text';
-import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
-import { matchModels } from '@blocksuite/affine-shared/utils';
-import type { BlockComponent } from '@blocksuite/std';
-import { InlineMarkdownExtension } from '@blocksuite/std/inline';
-
-export const DividerMarkdownExtension =
-  InlineMarkdownExtension<AffineTextAttributes>({
-    name: 'divider',
-    pattern: /^(-{3,}|\*{3,}|_{3,})\s$/,
-    action: ({ inlineEditor, inlineRange }) => {
-      if (inlineEditor.yTextString.slice(0, inlineRange.index).includes('\n')) {
-        return;
-      }
-
-      if (!inlineEditor.rootElement) return;
-      const blockComponent =
-        inlineEditor.rootElement.closest<BlockComponent>('[data-block-id]');
-      if (!blockComponent) return;
-
-      const { model, std, store } = blockComponent;
-
-      if (
-        matchModels(model, [ParagraphBlockModel]) &&
-        model.props.type !== 'quote'
-      ) {
-        const parent = store.getParent(model);
-        if (!parent) return;
-        const index = parent.children.indexOf(model);
-
-        store.captureSync();
-        inlineEditor.deleteText({
-          index: 0,
-          length: inlineRange.index,
-        });
-        store.addBlock<DividerBlockModel>(
-          DividerBlockSchema.model.flavour,
-          {
-            children: model.children,
-          },
-          parent,
-          index
-        );
-
-        const nextBlock = parent.children.at(index + 1);
-        let id = nextBlock?.id;
-        if (!id) {
-          id = store.addBlock<ParagraphBlockModel>(
-            ParagraphBlockSchema.model.flavour,
-            {},
-            parent
-          );
-        }
-        focusTextModel(std, id);
-      }
-    },
-  });

blocksuite/affine/blocks/divider/src/view.ts

@@ -6,7 +6,6 @@ import { BlockViewExtension } from '@blocksuite/std';
 import { literal } from 'lit/static-html.js';
 
 import { effects } from './effects';
-import { DividerMarkdownExtension } from './markdown';
 
 export class DividerViewExtension extends ViewExtensionProvider {
   override name = 'affine-divider-block';
@@ -20,7 +19,6 @@ export class DividerViewExtension extends ViewExtensionProvider {
     super.setup(context);
     context.register([
       BlockViewExtension('affine:divider', literal`affine-divider`),
-      DividerMarkdownExtension,
     ]);
   }
 }

blocksuite/affine/blocks/divider/tsconfig.json

@@ -10,7 +10,6 @@
     { "path": "../../components" },
     { "path": "../../ext-loader" },
     { "path": "../../model" },
-    { "path": "../../rich-text" },
     { "path": "../../shared" },
     { "path": "../../../framework/global" },
     { "path": "../../../framework/std" },

blocksuite/affine/blocks/embed-doc/src/embed-linked-doc-block/configs/toolbar.ts

@@ -259,18 +259,18 @@ const builtinToolbarConfig = {
     conversionsActionGroup,
     {
       id: 'c.style',
-      actions: (
-        [
-          {
-            id: 'horizontal',
-            label: 'Large horizontal style',
-          },
-          {
-            id: 'list',
-            label: 'Small horizontal style',
-          },
-        ] as const
-      ).filter(action => EmbedLinkedDocStyles.includes(action.id)),
+      actions: [
+        {
+          id: 'horizontal',
+          label: 'Large horizontal style',
+        },
+        {
+          id: 'list',
+          label: 'Small horizontal style',
+        },
+      ].filter(action =>
+        EmbedLinkedDocStyles.includes(action.id as EmbedCardStyle)
+      ),
       content(ctx) {
         const model = ctx.getCurrentModelByType(EmbedLinkedDocModel);
         if (!model) return null;
@@ -368,26 +368,26 @@ const builtinSurfaceToolbarConfig = {
     conversionsActionGroup,
     {
       id: 'c.style',
-      actions: (
-        [
-          {
-            id: 'horizontal',
-            label: 'Large horizontal style',
-          },
-          {
-            id: 'list',
-            label: 'Small horizontal style',
-          },
-          {
-            id: 'vertical',
-            label: 'Large vertical style',
-          },
-          {
-            id: 'cube',
-            label: 'Small vertical style',
-          },
-        ] as const
-      ).filter(action => EmbedLinkedDocStyles.includes(action.id)),
+      actions: [
+        {
+          id: 'horizontal',
+          label: 'Large horizontal style',
+        },
+        {
+          id: 'list',
+          label: 'Small horizontal style',
+        },
+        {
+          id: 'vertical',
+          label: 'Large vertical style',
+        },
+        {
+          id: 'cube',
+          label: 'Small vertical style',
+        },
+      ].filter(action =>
+        EmbedLinkedDocStyles.includes(action.id as EmbedCardStyle)
+      ),
       content(ctx) {
         const model = ctx.getCurrentModelByType(EmbedLinkedDocModel);
         if (!model) return null;

blocksuite/affine/blocks/embed-doc/src/embed-linked-doc-block/embed-linked-doc-block.ts

@@ -17,7 +17,6 @@ import {
   REFERENCE_NODE,
 } from '@blocksuite/affine-shared/consts';
 import {
-  CitationProvider,
   DocDisplayMetaProvider,
   DocModeProvider,
   OpenDocExtensionIdentifier,
@@ -44,7 +43,6 @@ import { repeat } from 'lit/directives/repeat.js';
 import { styleMap } from 'lit/directives/style-map.js';
 import { when } from 'lit/directives/when.js';
 import throttle from 'lodash-es/throttle';
-import { filter } from 'rxjs/operators';
 import * as Y from 'yjs';
 
 import { renderLinkedDocInCard } from '../common/render-linked-doc';
@@ -256,12 +254,11 @@ export class EmbedLinkedDocBlockComponent extends EmbedBlockComponent<EmbedLinke
     return this.store.readonly;
   }
 
-  get citationService() {
-    return this.std.get(CitationProvider);
-  }
-
   get isCitation() {
-    return this.citationService.isCitationModel(this.model);
+    return (
+      !!this.model.props.footnoteIdentifier &&
+      this.model.props.style === 'citation'
+    );
   }
 
   private readonly _handleDoubleClick = (event: MouseEvent) => {
@@ -457,31 +454,6 @@ export class EmbedLinkedDocBlockComponent extends EmbedBlockComponent<EmbedLinke
     );
   };
 
-  private readonly _trackCitationDeleteEvent = () => {
-    // Check citation delete event
-    this._disposables.add(
-      this.std.store.slots.blockUpdated
-        .pipe(
-          filter(payload => {
-            if (!payload.isLocal) return false;
-            const { flavour, id, type } = payload;
-            if (
-              type !== 'delete' ||
-              flavour !== this.model.flavour ||
-              id !== this.model.id
-            )
-              return false;
-            const { model } = payload;
-            if (!this.citationService.isCitationModel(model)) return false;
-            return true;
-          })
-        )
-        .subscribe(() => {
-          this.citationService.trackEvent('Delete');
-        })
-    );
-  };
-
   override connectedCallback() {
     super.connectedCallback();
 
@@ -560,8 +532,6 @@ export class EmbedLinkedDocBlockComponent extends EmbedBlockComponent<EmbedLinke
         }
       })
     );
-
-    this._trackCitationDeleteEvent();
   }
 
   getInitialState(): {

blocksuite/affine/blocks/embed/src/configs/toolbar.ts

@@ -153,7 +153,7 @@ function createBuiltinToolbarConfigForExternal(
                 .get(EmbedOptionProvider)
                 .getEmbedBlockOptions(url);
 
-              let style: EmbedCardStyle = model.props.style;
+              let { style } = model.props;
               let flavour = 'affine:bookmark';
 
               if (options?.viewType === 'card') {
@@ -227,7 +227,7 @@ function createBuiltinToolbarConfigForExternal(
               if (options?.viewType !== 'embed') return;
 
               const { flavour, styles } = options;
-              let style: EmbedCardStyle = model.props.style;
+              let { style } = model.props;
 
               if (!styles.includes(style)) {
                 style =
@@ -441,11 +441,7 @@ const createBuiltinSurfaceToolbarConfigForExternal = (
               let { style } = model.props;
               let flavour = 'affine:bookmark';
 
-              if (
-                !BookmarkStyles.includes(
-                  style as (typeof BookmarkStyles)[number]
-                )
-              ) {
+              if (!BookmarkStyles.includes(style)) {
                 style = BookmarkStyles[0];
               }
 
@@ -521,26 +517,26 @@ const createBuiltinSurfaceToolbarConfigForExternal = (
       } satisfies ToolbarActionGroup<ToolbarAction>,
       {
         id: 'c.style',
-        actions: (
-          [
-            {
-              id: 'horizontal',
-              label: 'Large horizontal style',
-            },
-            {
-              id: 'list',
-              label: 'Small horizontal style',
-            },
-            {
-              id: 'vertical',
-              label: 'Large vertical style',
-            },
-            {
-              id: 'cube',
-              label: 'Small vertical style',
-            },
-          ] as const
-        ).filter(action => EmbedGithubStyles.includes(action.id)),
+        actions: [
+          {
+            id: 'horizontal',
+            label: 'Large horizontal style',
+          },
+          {
+            id: 'list',
+            label: 'Small horizontal style',
+          },
+          {
+            id: 'vertical',
+            label: 'Large vertical style',
+          },
+          {
+            id: 'cube',
+            label: 'Small vertical style',
+          },
+        ].filter(action =>
+          EmbedGithubStyles.includes(action.id as EmbedCardStyle)
+        ),
         when(ctx) {
           return Boolean(ctx.getCurrentModelByType(EmbedGithubModel));
         },

blocksuite/affine/blocks/embed/src/embed-html-block/components/fullscreen-toolbar.ts

@@ -107,10 +107,10 @@ export class EmbedHtmlFullscreenToolbar extends LitElement {
     if (this._copied) return;
 
     this.embedHtml.std.clipboard
-      .writeToClipboard(items => ({
-        ...items,
-        'text/plain': this.embedHtml.model.props.html ?? '',
-      }))
+      .writeToClipboard(items => {
+        items['text/plain'] = this.embedHtml.model.props.html ?? '';
+        return items;
+      })
       .then(() => {
         this._copied = true;
         setTimeout(() => (this._copied = false), 1500);

blocksuite/affine/blocks/frame/src/frame-block.ts

@@ -16,7 +16,6 @@ import {
 import { cssVarV2 } from '@toeverything/theme/v2';
 import { html } from 'lit';
 import { state } from 'lit/decorators.js';
-import { repeat } from 'lit/directives/repeat.js';
 import { styleMap } from 'lit/directives/style-map.js';
 
 import {
@@ -88,12 +87,6 @@ export class FrameBlockComponent extends GfxBlockComponent<FrameBlockModel> {
       this.gfx.tool.currentToolName$.value === 'frameNavigator';
     const frameIndex = this.gfx.layer.getZIndex(model);
 
-    const widgets = html`${repeat(
-      Object.entries(this.widgets),
-      ([id]) => id,
-      ([_, widget]) => widget
-    )}`;
-
     return html`
       <div
         class="affine-frame-container"
@@ -109,7 +102,6 @@ export class FrameBlockComponent extends GfxBlockComponent<FrameBlockModel> {
               : `1px solid ${cssVarV2('edgeless/frame/border/default')}`,
         })}
       ></div>
-      ${widgets}
     `;
   }
 
@@ -186,22 +178,11 @@ export const FrameBlockInteraction =
           selectable(context) {
             const { model } = context;
 
-            const onTitle =
-              model.externalBound?.containsPoint([
-                context.position.x,
-                context.position.y,
-              ]) ?? false;
-
             return (
               context.default(context) &&
-              (model.isLocked() ||
-                !isTransparent(model.props.background) ||
-                onTitle)
+              (model.isLocked() || !isTransparent(model.props.background))
             );
           },
-          onSelect(context) {
-            return context.default(context);
-          },
         };
       },
     }

blocksuite/affine/blocks/frame/src/frame-manager.ts

@@ -241,35 +241,20 @@ export class EdgelessFrameManager extends GfxExtension {
       surfaceModel.elementAdded.subscribe(({ id, local }) => {
         const element = surfaceModel.getElementById(id);
         if (element && local) {
-          // The entire frame detection logic must be in microtask for timing reasons:
-          //
-          // 1. For connectors: When elementAdded fires, connectors have invalid bounds [0,0,0,0]
-          //    because their path/bounds are calculated in a separate microtask of updateConnectorPath by connector-watcher.
-          //    We need to wait for that calculation to complete before frame detection.
-          //
-          // 2. For shapes: Although they have valid bounds immediately, processing them in microtask
-          //    ensures consistent timing and allows other initialization to complete first.
-          //
-          // 3. Group compatibility: Some elements may need to establish their group relationships
-          //    before being considered for frame membership.
-          //
-          // By embedding the entire logic in microtask, we ensure:
-          // - Connectors have proper bounds calculated (not [0,0,0,0])
-          // - getFrameFromPoint() works correctly with valid element centers
-          // - All element initialization is complete before frame detection
+          const frame = this.getFrameFromPoint(element.elementBound.center);
+
+          // if the container created with a frame, skip it.
+          if (
+            isGfxGroupCompatibleModel(element) &&
+            frame &&
+            element.hasChild(frame)
+          ) {
+            return;
+          }
+
+          // new element may intended to be added to other group
+          // so we need to wait for the next microtask to check if the element can be added to the frame
           queueMicrotask(() => {
-            const frame = this.getFrameFromPoint(element.elementBound.center);
-
-            // if the container created with a frame, skip it.
-            if (
-              isGfxGroupCompatibleModel(element) &&
-              frame &&
-              element.hasChild(frame)
-            ) {
-              return;
-            }
-
-            // Only add elements that aren't already grouped and have a valid frame
             if (!element.group && frame) {
               this.addElementsToFrame(frame, [element]);
             }

blocksuite/affine/blocks/image/src/utils.ts

@@ -11,7 +11,6 @@ import {
   NativeClipboardProvider,
 } from '@blocksuite/affine-shared/services';
 import {
-  convertToPng,
   formatSize,
   getBlockProps,
   isInsidePageEditor,
@@ -112,6 +111,28 @@ export async function resetImageSize(
   block.store.updateBlock(model, props);
 }
 
+function convertToPng(blob: Blob): Promise<Blob | null> {
+  return new Promise(resolve => {
+    const reader = new FileReader();
+    reader.addEventListener('load', _ => {
+      const img = new Image();
+      img.onload = () => {
+        const c = document.createElement('canvas');
+        c.width = img.width;
+        c.height = img.height;
+        const ctx = c.getContext('2d');
+        if (!ctx) return;
+        ctx.drawImage(img, 0, 0);
+        c.toBlob(resolve, 'image/png');
+      };
+      img.onerror = () => resolve(null);
+      img.src = reader.result as string;
+    });
+    reader.addEventListener('error', () => resolve(null));
+    reader.readAsDataURL(blob);
+  });
+}
+
 export async function copyImageBlob(
   block: ImageBlockComponent | ImageEdgelessBlockComponent
 ) {

blocksuite/affine/blocks/list/src/list-keymap.ts

@@ -1,5 +1,6 @@
 import { textKeymap } from '@blocksuite/affine-inline-preset';
 import { ListBlockSchema } from '@blocksuite/affine-model';
+import { markdownInput } from '@blocksuite/affine-rich-text';
 import { getSelectedModelsCommand } from '@blocksuite/affine-shared/commands';
 import { IS_MAC } from '@blocksuite/global/env';
 import { KeymapExtension, TextSelection } from '@blocksuite/std';
@@ -124,6 +125,20 @@ export const ListKeymapExtension = KeymapExtension(
         ctx.get('keyboardState').raw.preventDefault();
         return true;
       },
+      Space: ctx => {
+        if (!markdownInput(std)) {
+          return;
+        }
+        ctx.get('keyboardState').raw.preventDefault();
+        return true;
+      },
+      'Shift-Space': ctx => {
+        if (!markdownInput(std)) {
+          return;
+        }
+        ctx.get('keyboardState').raw.preventDefault();
+        return true;
+      },
     };
   },
   {

blocksuite/affine/blocks/list/src/markdown.ts

@@ -1,91 +0,0 @@
-import {
-  type ListBlockModel,
-  ListBlockSchema,
-  type ListType,
-  ParagraphBlockModel,
-} from '@blocksuite/affine-model';
-import { focusTextModel } from '@blocksuite/affine-rich-text';
-import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
-import { matchModels, toNumberedList } from '@blocksuite/affine-shared/utils';
-import type { BlockComponent } from '@blocksuite/std';
-import { InlineMarkdownExtension } from '@blocksuite/std/inline';
-
-export const ListMarkdownExtension =
-  InlineMarkdownExtension<AffineTextAttributes>({
-    name: 'list',
-    // group 2: number
-    // group 3: bullet
-    // group 4: bullet
-    // group 5: todo
-    // group 6: todo checked
-    pattern: /^((\d+\.)|(-)|(\*)|(\[ ?\])|(\[x\]))\s$/,
-    action: ({ inlineEditor, pattern, inlineRange, prefixText }) => {
-      if (inlineEditor.yTextString.slice(0, inlineRange.index).includes('\n')) {
-        return;
-      }
-
-      const match = prefixText.match(pattern);
-      if (!match) return;
-
-      let type: ListType;
-
-      if (match[2]) {
-        type = 'numbered';
-      } else if (match[3] || match[4]) {
-        type = 'bulleted';
-      } else if (match[5] || match[6]) {
-        type = 'todo';
-      } else {
-        return;
-      }
-
-      const checked = match[6] !== undefined;
-
-      if (!inlineEditor.rootElement) return;
-      const blockComponent =
-        inlineEditor.rootElement.closest<BlockComponent>('[data-block-id]');
-      if (!blockComponent) return;
-
-      const { model, std, store } = blockComponent;
-      if (!matchModels(model, [ParagraphBlockModel])) return;
-
-      if (type !== 'numbered') {
-        const parent = store.getParent(model);
-        if (!parent) return;
-        const index = parent.children.indexOf(model);
-
-        store.captureSync();
-        inlineEditor.deleteText({
-          index: 0,
-          length: inlineRange.index,
-        });
-        const id = store.addBlock<ListBlockModel>(
-          ListBlockSchema.model.flavour,
-          {
-            type: type,
-            text: model.text?.clone(),
-            children: model.children,
-            ...(type === 'todo' ? { checked } : {}),
-          },
-          parent,
-          index
-        );
-        store.deleteBlock(model, { deleteChildren: false });
-        focusTextModel(std, id);
-      } else {
-        let order = parseInt(match[2]);
-        if (!Number.isInteger(order)) order = 1;
-
-        store.captureSync();
-        inlineEditor.deleteText({
-          index: 0,
-          length: inlineRange.index,
-        });
-
-        const id = toNumberedList(std, model, order);
-        if (!id) return;
-
-        focusTextModel(std, id);
-      }
-    },
-  });

blocksuite/affine/blocks/list/src/view.ts

@@ -7,7 +7,6 @@ import { literal } from 'lit/static-html.js';
 
 import { effects } from './effects.js';
 import { ListKeymapExtension, ListTextKeymapExtension } from './list-keymap.js';
-import { ListMarkdownExtension } from './markdown.js';
 
 export class ListViewExtension extends ViewExtensionProvider {
   override name = 'affine-list-block';
@@ -24,7 +23,6 @@ export class ListViewExtension extends ViewExtensionProvider {
       BlockViewExtension('affine:list', literal`affine-list`),
       ListKeymapExtension,
       ListTextKeymapExtension,
-      ListMarkdownExtension,
     ]);
   }
 }

blocksuite/affine/blocks/paragraph/src/markdown.ts

@@ -1,74 +0,0 @@
-import {
-  ListBlockModel,
-  ParagraphBlockModel,
-  ParagraphBlockSchema,
-  type ParagraphType,
-} from '@blocksuite/affine-model';
-import { focusTextModel } from '@blocksuite/affine-rich-text';
-import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
-import { matchModels } from '@blocksuite/affine-shared/utils';
-import type { BlockComponent } from '@blocksuite/std';
-import { InlineMarkdownExtension } from '@blocksuite/std/inline';
-
-export const ParagraphMarkdownExtension =
-  InlineMarkdownExtension<AffineTextAttributes>({
-    name: 'heading',
-    pattern: /^((#{1,6})|(>))\s$/,
-    action: ({ inlineEditor, pattern, inlineRange, prefixText }) => {
-      if (inlineEditor.yTextString.slice(0, inlineRange.index).includes('\n')) {
-        return;
-      }
-
-      const match = prefixText.match(pattern);
-      if (!match) return;
-
-      const type = (
-        match[2] ? `h${match[2].length}` : 'quote'
-      ) as ParagraphType;
-
-      if (!inlineEditor.rootElement) return;
-      const blockComponent =
-        inlineEditor.rootElement.closest<BlockComponent>('[data-block-id]');
-      if (!blockComponent) return;
-
-      const { model, std, store } = blockComponent;
-      if (
-        !matchModels(model, [ParagraphBlockModel]) &&
-        matchModels(model, [ListBlockModel])
-      ) {
-        const parent = store.getParent(model);
-        if (!parent) return;
-        const index = parent.children.indexOf(model);
-
-        store.captureSync();
-        inlineEditor.deleteText({
-          index: 0,
-          length: inlineRange.index,
-        });
-        store.deleteBlock(model, { deleteChildren: false });
-        const id = store.addBlock<ParagraphBlockModel>(
-          ParagraphBlockSchema.model.flavour,
-          {
-            type: type,
-            text: model.text?.clone(),
-            children: model.children,
-          },
-          parent,
-          index
-        );
-
-        focusTextModel(std, id);
-      } else if (
-        matchModels(model, [ParagraphBlockModel]) &&
-        model.props.type !== type
-      ) {
-        store.captureSync();
-        inlineEditor.deleteText({
-          index: 0,
-          length: inlineRange.index,
-        });
-        store.updateBlock(model, { type });
-        focusTextModel(std, model.id);
-      }
-    },
-  });

blocksuite/affine/blocks/paragraph/src/paragraph-block.ts

@@ -7,10 +7,7 @@ import {
   BLOCK_CHILDREN_CONTAINER_PADDING_LEFT,
   EDGELESS_TOP_CONTENTEDITABLE_SELECTOR,
 } from '@blocksuite/affine-shared/consts';
-import {
-  CitationProvider,
-  DocModeProvider,
-} from '@blocksuite/affine-shared/services';
+import { DocModeProvider } from '@blocksuite/affine-shared/services';
 import {
   calculateCollapsedSiblings,
   getNearestHeadingBefore,
@@ -66,10 +63,6 @@ export class ParagraphBlockComponent extends CaptionedBlockComponent<ParagraphBl
       ?.getPlaceholder(this.model);
   }
 
-  get citationService() {
-    return this.std.get(CitationProvider);
-  }
-
   get attributeRenderer() {
     return this.inlineManager.getRenderer();
   }
@@ -101,12 +94,6 @@ export class ParagraphBlockComponent extends CaptionedBlockComponent<ParagraphBl
     return this.std.get(DefaultInlineManagerExtension.identifier);
   }
 
-  get hasCitationSiblings() {
-    return this.collapsedSiblings.some(sibling =>
-      this.citationService.isCitationModel(sibling)
-    );
-  }
-
   override get topContenteditableElement() {
     if (this.std.get(DocModeProvider).getEditorMode() === 'edgeless') {
       return this.closest<BlockComponent>(
@@ -299,13 +286,6 @@ export class ParagraphBlockComponent extends CaptionedBlockComponent<ParagraphBl
                         collapsed: value,
                       });
                     }
-
-                    if (this.hasCitationSiblings) {
-                      this.citationService.trackEvent('Expand', {
-                        control: 'Source Button',
-                        type: value ? 'Hide' : 'Show',
-                      });
-                    }
                   }}
                 ></blocksuite-toggle-button>
               `

blocksuite/affine/blocks/paragraph/src/paragraph-keymap.ts

@@ -7,6 +7,7 @@ import {
 import {
   focusTextModel,
   getInlineEditorByModel,
+  markdownInput,
 } from '@blocksuite/affine-rich-text';
 import {
   calculateCollapsedSiblings,
@@ -147,6 +148,10 @@ export const ParagraphKeymapExtension = KeymapExtension(
 
         raw.preventDefault();
 
+        if (markdownInput(std, model.id)) {
+          return true;
+        }
+
         if (model.props.type.startsWith('h') && model.props.collapsed) {
           const parent = store.getParent(model);
           if (!parent) return true;
@@ -194,6 +199,20 @@ export const ParagraphKeymapExtension = KeymapExtension(
         event.preventDefault();
         return true;
       },
+      Space: ctx => {
+        if (!markdownInput(std)) {
+          return;
+        }
+        ctx.get('keyboardState').raw.preventDefault();
+        return true;
+      },
+      'Shift-Space': ctx => {
+        if (!markdownInput(std)) {
+          return;
+        }
+        ctx.get('keyboardState').raw.preventDefault();
+        return true;
+      },
       Tab: ctx => {
         const [success] = std.command
           .chain()

blocksuite/affine/blocks/paragraph/src/utils/merge-with-prev.ts

@@ -20,7 +20,6 @@ import { EMBED_BLOCK_MODEL_LIST } from '@blocksuite/affine-shared/consts';
 import type { ExtendedModel } from '@blocksuite/affine-shared/types';
 import {
   focusTitle,
-  getDocTitleInlineEditor,
   getPrevContentBlock,
   matchModels,
 } from '@blocksuite/affine-shared/utils';
@@ -46,6 +45,10 @@ export function mergeWithPrev(editorHost: EditorHost, model: BlockModel) {
   const parent = doc.getParent(model);
   if (!parent) return false;
 
+  if (matchModels(parent, [EdgelessTextBlockModel])) {
+    return true;
+  }
+
   const prevBlock = getPrevContentBlock(editorHost, model);
   if (!prevBlock) {
     return handleNoPreviousSibling(editorHost, model);
@@ -120,63 +123,36 @@ function handleNoPreviousSibling(editorHost: EditorHost, model: ExtendedModel) {
   const parent = doc.getParent(model);
   if (!parent) return false;
 
-  const focusFirstBlockStart = () => {
-    const firstBlock = parent.firstChild();
-    if (firstBlock) {
-      focusTextModel(editorHost.std, firstBlock.id, 0);
-    }
-  };
-
-  if (matchModels(parent, [NoteBlockModel])) {
-    const hasTitleEditor = getDocTitleInlineEditor(editorHost);
+  if (matchModels(parent, [NoteBlockModel]) && parent.isPageBlock()) {
     const rootModel = model.store.root as RootBlockModel;
     const title = rootModel.props.title;
 
-    const shouldHandleTitle = parent.isPageBlock() && hasTitleEditor;
-
     doc.captureSync();
-
-    if (shouldHandleTitle) {
-      let textLength = 0;
-      if (text) {
-        textLength = text.length;
-        title.join(text);
-      }
-      if (model.children.length > 0 || doc.getNext(model)) {
-        doc.deleteBlock(model, {
-          bringChildrenTo: parent,
-        });
-      }
-      // no other blocks, preserve a empty line
-      else {
-        text?.clear();
-      }
-      focusTitle(editorHost, title.length - textLength);
-      return true;
+    let textLength = 0;
+    if (text) {
+      textLength = text.length;
+      title.join(text);
     }
 
     // Preserve at least one block to be able to focus on container click
-    if (
-      text?.length === 0 &&
-      (model.children.length > 0 || doc.getNext(model))
-    ) {
+    if (doc.getNext(model) || model.children.length > 0) {
       doc.deleteBlock(model, {
         bringChildrenTo: parent,
       });
-      focusFirstBlockStart();
-      return true;
+    } else {
+      text?.clear();
     }
+    focusTitle(editorHost, title.length - textLength);
+    return true;
   }
 
   if (
-    matchModels(parent, [EdgelessTextBlockModel]) &&
-    text?.length === 0 &&
-    (model.children.length > 0 || doc.getNext(model))
+    matchModels(parent, [EdgelessTextBlockModel]) ||
+    model.children.length > 0
   ) {
     doc.deleteBlock(model, {
       bringChildrenTo: parent,
     });
-    focusFirstBlockStart();
     return true;
   }
 

blocksuite/affine/blocks/paragraph/src/view.ts

@@ -2,13 +2,9 @@ import {
   type ViewExtensionContext,
   ViewExtensionProvider,
 } from '@blocksuite/affine-ext-loader';
-import { ParagraphBlockModel } from '@blocksuite/affine-model';
 import { BlockViewExtension, FlavourExtension } from '@blocksuite/std';
 import { literal } from 'lit/static-html.js';
-import { z } from 'zod';
 
-import { effects } from './effects';
-import { ParagraphMarkdownExtension } from './markdown.js';
 import { ParagraphBlockConfigExtension } from './paragraph-block-config.js';
 import {
   ParagraphKeymapExtension,
@@ -26,6 +22,11 @@ const placeholders = {
   quote: '',
 };
 
+import { ParagraphBlockModel } from '@blocksuite/affine-model';
+import { z } from 'zod';
+
+import { effects } from './effects';
+
 const optionsSchema = z.object({
   getPlaceholder: z.optional(
     z.function().args(z.instanceof(ParagraphBlockModel)).returns(z.string())
@@ -60,7 +61,6 @@ export class ParagraphViewExtension extends ViewExtensionProvider<
       ParagraphBlockConfigExtension({
         getPlaceholder,
       }),
-      ParagraphMarkdownExtension,
     ]);
   }
 }

blocksuite/affine/blocks/root/src/edgeless/clipboard/clipboard.ts

@@ -9,10 +9,7 @@ import {
   getSurfaceComponent,
 } from '@blocksuite/affine-block-surface';
 import { splitIntoLines } from '@blocksuite/affine-gfx-text';
-import type {
-  EmbedCardStyle,
-  ShapeElementModel,
-} from '@blocksuite/affine-model';
+import type { ShapeElementModel } from '@blocksuite/affine-model';
 import {
   BookmarkStyles,
   DEFAULT_NOTE_HEIGHT,
@@ -35,7 +32,6 @@ import {
   TelemetryProvider,
 } from '@blocksuite/affine-shared/services';
 import {
-  convertToPng,
   isInsidePageEditor,
   isTopLevelBlock,
   isUrlInClipboard,
@@ -68,7 +64,7 @@ import * as Y from 'yjs';
 
 import { PageClipboard } from '../../clipboard/index.js';
 import { getSortedCloneElements } from '../utils/clone-utils.js';
-import { isCanvasElementWithText, isImageBlock } from '../utils/query.js';
+import { isCanvasElementWithText } from '../utils/query.js';
 import { createElementsFromClipboardDataCommand } from './command.js';
 import {
   isPureFileInClipboard,
@@ -127,49 +123,6 @@ export class EdgelessClipboardController extends PageClipboard {
       return;
     }
 
-    // Only when an image is selected, it can be pasted normally to page mode.
-    if (elements.length === 1 && isImageBlock(elements[0])) {
-      const element = elements[0];
-      const sourceId = element.props.sourceId$.peek();
-      if (!sourceId) return;
-
-      await this.std.clipboard.writeToClipboard(async items => {
-        const job = this.std.store.getTransformer();
-        await job.assetsManager.readFromBlob(sourceId);
-
-        let blob = job.assetsManager.getAssets().get(sourceId) ?? null;
-        if (!blob) {
-          return items;
-        }
-
-        let type = blob.type;
-        let supported = false;
-
-        try {
-          supported = ClipboardItem?.supports(type) ?? false;
-        } catch (err) {
-          console.error(err);
-        }
-
-        // TODO(@fundon): when converting jpeg to png, image may become larger and exceed the limit.
-        if (!supported) {
-          type = 'image/png';
-          blob = await convertToPng(blob);
-        }
-
-        if (blob) {
-          return {
-            ...items,
-            [`${type}`]: blob,
-          };
-        }
-
-        return items;
-      });
-
-      return;
-    }
-
     await this.std.clipboard.writeToClipboard(async _items => {
       const data = await prepareClipboardData(elements, this.std);
       return {
@@ -283,7 +236,7 @@ export class EdgelessClipboardController extends PageClipboard {
       const options: Record<string, unknown> = {};
 
       let flavour = 'affine:bookmark';
-      let style: EmbedCardStyle = BookmarkStyles[0];
+      let style = BookmarkStyles[0];
       let isInternalLink = false;
       let isLinkedBlock = false;
 
@@ -606,10 +559,6 @@ export class EdgelessClipboardController extends PageClipboard {
   }
 
   private async _pasteTextContentAsNote(content: BlockSnapshot[] | string) {
-    if (content === '') {
-      return;
-    }
-
     const { x, y } = this.toolManager.lastMousePos$.peek();
 
     const noteProps = {

blocksuite/affine/blocks/root/src/edgeless/clipboard/utils.ts

@@ -69,39 +69,37 @@ export async function prepareClipboardData(
 
 export function isPureFileInClipboard(clipboardData: DataTransfer) {
   const types = clipboardData.types;
-  const allowedTypes = new Set([
-    'Files',
-    'text/plain',
-    'text/html',
-    'application/x-moz-file',
-  ]);
-
-  return types.includes('Files') && types.every(type => allowedTypes.has(type));
+  return (
+    (types.length === 1 && types[0] === 'Files') ||
+    (types.length === 2 &&
+      (types.includes('text/plain') || types.includes('text/html')) &&
+      types.includes('Files'))
+  );
 }
 
 export function tryGetSvgFromClipboard(clipboardData: DataTransfer) {
-  try {
-    const parser = new DOMParser();
-    const svgDoc = parser.parseFromString(
-      clipboardData.getData('text/plain'),
-      'image/svg+xml'
-    );
-    const svg = svgDoc.documentElement;
+  const types = clipboardData.types;
 
-    if (svg.tagName !== 'svg' || !svg.hasAttribute('xmlns')) {
-      return null;
-    }
-    const svgContent = DOMPurify.sanitize(svgDoc.documentElement, {
-      USE_PROFILES: { svg: true },
-    });
-    const blob = new Blob([svgContent], { type: 'image/svg+xml' });
-    const file = new File([blob], 'pasted-image.svg', {
-      type: 'image/svg+xml',
-    });
-    return file;
-  } catch {
+  if (types.length === 1 && types[0] !== 'text/plain') {
     return null;
   }
+
+  const parser = new DOMParser();
+  const svgDoc = parser.parseFromString(
+    clipboardData.getData('text/plain'),
+    'image/svg+xml'
+  );
+  const svg = svgDoc.documentElement;
+
+  if (svg.tagName !== 'svg' || !svg.hasAttribute('xmlns')) {
+    return null;
+  }
+  const svgContent = DOMPurify.sanitize(svgDoc.documentElement, {
+    USE_PROFILES: { svg: true },
+  });
+  const blob = new Blob([svgContent], { type: 'image/svg+xml' });
+  const file = new File([blob], 'pasted-image.svg', { type: 'image/svg+xml' });
+  return file;
 }
 
 export function edgelessElementsBoundFromRawData(

blocksuite/affine/blocks/surface/src/renderer/dom-renderer.ts

@@ -43,25 +43,6 @@ type RendererOptions = {
   surfaceModel: SurfaceBlockModel;
 };
 
-const UpdateType = {
-  ELEMENT_ADDED: 'element-added',
-  ELEMENT_REMOVED: 'element-removed',
-  ELEMENT_UPDATED: 'element-updated',
-  VIEWPORT_CHANGED: 'viewport-changed',
-  SIZE_CHANGED: 'size-changed',
-  ZOOM_STATE_CHANGED: 'zoom-state-changed',
-} as const;
-
-type UpdateType = (typeof UpdateType)[keyof typeof UpdateType];
-
-interface IncrementalUpdateState {
-  dirtyElementIds: Set<string>;
-  viewportDirty: boolean;
-  sizeDirty: boolean;
-  usePlaceholderDirty: boolean;
-  pendingUpdates: Map<string, UpdateType[]>;
-}
-
 const PLACEHOLDER_RESET_STYLES = {
   border: 'none',
   borderRadius: '0',
@@ -160,18 +141,6 @@ export class DomRenderer {
 
   private _sizeUpdatedRafId: number | null = null;
 
-  private readonly _updateState: IncrementalUpdateState = {
-    dirtyElementIds: new Set(),
-    viewportDirty: false,
-    sizeDirty: false,
-    usePlaceholderDirty: false,
-    pendingUpdates: new Map(),
-  };
-
-  private _lastViewportBounds: Bound | null = null;
-  private _lastZoom: number | null = null;
-  private _lastUsePlaceholder: boolean = false;
-
   rootElement: HTMLElement;
 
   private readonly _elementsMap = new Map<string, HTMLElement>();
@@ -217,7 +186,6 @@ export class DomRenderer {
   private _initViewport() {
     this._disposables.add(
       this.viewport.viewportUpdated.subscribe(() => {
-        this._markViewportDirty();
         this.refresh();
       })
     );
@@ -227,7 +195,6 @@ export class DomRenderer {
         if (this._sizeUpdatedRafId) return;
         this._sizeUpdatedRafId = requestConnectedFrame(() => {
           this._sizeUpdatedRafId = null;
-          this._markSizeDirty();
           this._resetSize();
           this._render();
           this.refresh();
@@ -241,7 +208,6 @@ export class DomRenderer {
 
         if (this.usePlaceholder !== shouldRenderPlaceholders) {
           this.usePlaceholder = shouldRenderPlaceholders;
-          this._markUsePlaceholderDirty();
           this.refresh();
         }
       })
@@ -341,292 +307,6 @@ export class DomRenderer {
   }
 
   private _render() {
-    this._renderIncremental();
-  }
-
-  private _watchSurface(surfaceModel: SurfaceBlockModel) {
-    this._disposables.add(
-      surfaceModel.elementAdded.subscribe(payload => {
-        this._markElementDirty(payload.id, UpdateType.ELEMENT_ADDED);
-        this.refresh();
-      })
-    );
-    this._disposables.add(
-      surfaceModel.elementRemoved.subscribe(payload => {
-        this._markElementDirty(payload.id, UpdateType.ELEMENT_REMOVED);
-        this.refresh();
-      })
-    );
-    this._disposables.add(
-      surfaceModel.localElementAdded.subscribe(payload => {
-        this._markElementDirty(payload.id, UpdateType.ELEMENT_ADDED);
-        this.refresh();
-      })
-    );
-    this._disposables.add(
-      surfaceModel.localElementDeleted.subscribe(payload => {
-        this._markElementDirty(payload.id, UpdateType.ELEMENT_REMOVED);
-        this.refresh();
-      })
-    );
-    this._disposables.add(
-      surfaceModel.localElementUpdated.subscribe(payload => {
-        this._markElementDirty(payload.model.id, UpdateType.ELEMENT_UPDATED);
-        this.refresh();
-      })
-    );
-
-    this._disposables.add(
-      surfaceModel.elementUpdated.subscribe(payload => {
-        // ignore externalXYWH update cause it's updated by the renderer
-        if (payload.props['externalXYWH']) return;
-        this._markElementDirty(payload.id, UpdateType.ELEMENT_UPDATED);
-        this.refresh();
-      })
-    );
-  }
-
-  addOverlay = (overlay: Overlay) => {
-    overlay.setRenderer(null);
-    this._overlays.add(overlay);
-    this.refresh();
-  };
-
-  attach = (container: HTMLElement) => {
-    this._container = container;
-    container.append(this.rootElement);
-
-    this._resetSize();
-    this.refresh();
-  };
-
-  dispose = () => {
-    this._overlays.forEach(overlay => overlay.dispose());
-    this._overlays.clear();
-    this._disposables.dispose();
-
-    if (this._refreshRafId) {
-      cancelAnimationFrame(this._refreshRafId);
-      this._refreshRafId = null;
-    }
-    if (this._sizeUpdatedRafId) {
-      cancelAnimationFrame(this._sizeUpdatedRafId);
-      this._sizeUpdatedRafId = null;
-    }
-
-    this.rootElement.remove();
-    this._elementsMap.clear();
-  };
-
-  generateColorProperty = (color: Color, fallback?: Color) => {
-    return (
-      this.provider.generateColorProperty?.(color, fallback) ?? 'transparent'
-    );
-  };
-
-  getColorScheme = () => {
-    return this.provider.getColorScheme?.() ?? ColorScheme.Light;
-  };
-
-  getColorValue = (color: Color, fallback?: Color, real?: boolean) => {
-    return (
-      this.provider.getColorValue?.(color, fallback, real) ?? 'transparent'
-    );
-  };
-
-  getPropertyValue = (property: string) => {
-    return this.provider.getPropertyValue?.(property) ?? '';
-  };
-
-  refresh = () => {
-    if (this._refreshRafId !== null) return;
-
-    this._refreshRafId = requestConnectedFrame(() => {
-      this._refreshRafId = null;
-      this._render();
-    }, this._container);
-  };
-
-  removeOverlay = (overlay: Overlay) => {
-    if (!this._overlays.has(overlay)) {
-      return;
-    }
-
-    this._overlays.delete(overlay);
-    this.refresh();
-  };
-
-  /**
-   * Mark a specific element as dirty for incremental updates
-   * @param elementId - The ID of the element to mark as dirty
-   * @param updateType - The type of update (optional, defaults to ELEMENT_UPDATED)
-   */
-  markElementDirty = (
-    elementId: string,
-    updateType: UpdateType = UpdateType.ELEMENT_UPDATED
-  ) => {
-    this._markElementDirty(elementId, updateType);
-  };
-
-  /**
-   * Force a full re-render of all elements
-   */
-  forceFullRender = () => {
-    this._updateState.viewportDirty = true;
-    this.refresh();
-  };
-
-  private _markElementDirty(elementId: string, updateType: UpdateType) {
-    this._updateState.dirtyElementIds.add(elementId);
-    const currentUpdates =
-      this._updateState.pendingUpdates.get(elementId) || [];
-    if (!currentUpdates.includes(updateType)) {
-      currentUpdates.push(updateType);
-      this._updateState.pendingUpdates.set(elementId, currentUpdates);
-    }
-  }
-
-  private _markViewportDirty() {
-    this._updateState.viewportDirty = true;
-  }
-
-  private _markSizeDirty() {
-    this._updateState.sizeDirty = true;
-  }
-
-  private _markUsePlaceholderDirty() {
-    this._updateState.usePlaceholderDirty = true;
-  }
-
-  private _clearUpdateState() {
-    this._updateState.dirtyElementIds.clear();
-    this._updateState.viewportDirty = false;
-    this._updateState.sizeDirty = false;
-    this._updateState.usePlaceholderDirty = false;
-    this._updateState.pendingUpdates.clear();
-  }
-
-  private _isViewportChanged(): boolean {
-    const { viewportBounds, zoom } = this.viewport;
-
-    if (!this._lastViewportBounds || !this._lastZoom) {
-      return true;
-    }
-
-    return (
-      this._lastViewportBounds.x !== viewportBounds.x ||
-      this._lastViewportBounds.y !== viewportBounds.y ||
-      this._lastViewportBounds.w !== viewportBounds.w ||
-      this._lastViewportBounds.h !== viewportBounds.h ||
-      this._lastZoom !== zoom
-    );
-  }
-
-  private _isUsePlaceholderChanged(): boolean {
-    return this._lastUsePlaceholder !== this.usePlaceholder;
-  }
-
-  private _updateLastState() {
-    const { viewportBounds, zoom } = this.viewport;
-    this._lastViewportBounds = {
-      x: viewportBounds.x,
-      y: viewportBounds.y,
-      w: viewportBounds.w,
-      h: viewportBounds.h,
-    } as Bound;
-    this._lastZoom = zoom;
-    this._lastUsePlaceholder = this.usePlaceholder;
-  }
-
-  private _renderIncremental() {
-    const { viewportBounds, zoom } = this.viewport;
-    const addedElements: HTMLElement[] = [];
-    const elementsToRemove: HTMLElement[] = [];
-
-    const needsFullRender =
-      this._isViewportChanged() ||
-      this._isUsePlaceholderChanged() ||
-      this._updateState.sizeDirty ||
-      this._updateState.viewportDirty ||
-      this._updateState.usePlaceholderDirty;
-
-    if (needsFullRender) {
-      this._renderFull();
-      this._updateLastState();
-      this._clearUpdateState();
-      return;
-    }
-
-    // Only update dirty elements
-    const elementsFromGrid = this.grid.search(viewportBounds, {
-      filter: ['canvas', 'local'],
-    }) as SurfaceElementModel[];
-
-    const visibleElementIds = new Set<string>();
-
-    // 1. Update dirty elements
-    for (const elementModel of elementsFromGrid) {
-      const display = (elementModel.display ?? true) && !elementModel.hidden;
-      if (
-        display &&
-        intersects(getBoundWithRotation(elementModel), viewportBounds)
-      ) {
-        visibleElementIds.add(elementModel.id);
-
-        // Only update dirty elements
-        if (this._updateState.dirtyElementIds.has(elementModel.id)) {
-          if (
-            this.usePlaceholder &&
-            !(elementModel as GfxCompatibleInterface).forceFullRender
-          ) {
-            this._renderOrUpdatePlaceholder(
-              elementModel,
-              viewportBounds,
-              zoom,
-              addedElements
-            );
-          } else {
-            this._renderOrUpdateFullElement(
-              elementModel,
-              viewportBounds,
-              zoom,
-              addedElements
-            );
-          }
-        }
-      }
-    }
-
-    // 2. Remove elements that are no longer in the grid
-    for (const elementId of this._updateState.dirtyElementIds) {
-      const updateTypes = this._updateState.pendingUpdates.get(elementId) || [];
-      if (
-        updateTypes.includes(UpdateType.ELEMENT_REMOVED) ||
-        !visibleElementIds.has(elementId)
-      ) {
-        const domElem = this._elementsMap.get(elementId);
-        if (domElem) {
-          domElem.remove();
-          this._elementsMap.delete(elementId);
-          elementsToRemove.push(domElem);
-        }
-      }
-    }
-
-    // 3. Notify changes
-    if (addedElements.length > 0 || elementsToRemove.length > 0) {
-      this.elementsUpdated.next({
-        elements: Array.from(this._elementsMap.values()),
-        added: addedElements,
-        removed: elementsToRemove,
-      });
-    }
-
-    this._updateLastState();
-    this._clearUpdateState();
-  }
-
-  private _renderFull() {
     const { viewportBounds, zoom } = this.viewport;
     const addedElements: HTMLElement[] = [];
     const elementsToRemove: HTMLElement[] = [];
@@ -707,4 +387,100 @@ export class DomRenderer {
       });
     }
   }
+
+  private _watchSurface(surfaceModel: SurfaceBlockModel) {
+    this._disposables.add(
+      surfaceModel.elementAdded.subscribe(() => this.refresh())
+    );
+    this._disposables.add(
+      surfaceModel.elementRemoved.subscribe(() => this.refresh())
+    );
+    this._disposables.add(
+      surfaceModel.localElementAdded.subscribe(() => this.refresh())
+    );
+    this._disposables.add(
+      surfaceModel.localElementDeleted.subscribe(() => this.refresh())
+    );
+    this._disposables.add(
+      surfaceModel.localElementUpdated.subscribe(() => this.refresh())
+    );
+
+    this._disposables.add(
+      surfaceModel.elementUpdated.subscribe(payload => {
+        // ignore externalXYWH update cause it's updated by the renderer
+        if (payload.props['externalXYWH']) return;
+        this.refresh();
+      })
+    );
+  }
+
+  addOverlay(overlay: Overlay) {
+    overlay.setRenderer(null);
+    this._overlays.add(overlay);
+    this.refresh();
+  }
+
+  attach(container: HTMLElement) {
+    this._container = container;
+    container.append(this.rootElement);
+
+    this._resetSize();
+    this.refresh();
+  }
+
+  dispose(): void {
+    this._overlays.forEach(overlay => overlay.dispose());
+    this._overlays.clear();
+    this._disposables.dispose();
+
+    if (this._refreshRafId) {
+      cancelAnimationFrame(this._refreshRafId);
+      this._refreshRafId = null;
+    }
+    if (this._sizeUpdatedRafId) {
+      cancelAnimationFrame(this._sizeUpdatedRafId);
+      this._sizeUpdatedRafId = null;
+    }
+
+    this.rootElement.remove();
+    this._elementsMap.clear();
+  }
+
+  generateColorProperty(color: Color, fallback?: Color) {
+    return (
+      this.provider.generateColorProperty?.(color, fallback) ?? 'transparent'
+    );
+  }
+
+  getColorScheme() {
+    return this.provider.getColorScheme?.() ?? ColorScheme.Light;
+  }
+
+  getColorValue(color: Color, fallback?: Color, real?: boolean) {
+    return (
+      this.provider.getColorValue?.(color, fallback, real) ?? 'transparent'
+    );
+  }
+
+  getPropertyValue(property: string) {
+    return this.provider.getPropertyValue?.(property) ?? '';
+  }
+
+  refresh() {
+    if (this._refreshRafId !== null) return;
+
+    this._refreshRafId = requestConnectedFrame(() => {
+      this._refreshRafId = null;
+      this._render();
+    }, this._container);
+  }
+
+  removeOverlay(overlay: Overlay) {
+    if (!this._overlays.has(overlay)) {
+      return;
+    }
+
+    this._overlays.delete(overlay);
+    this.refresh();
+  }
 }

blocksuite/affine/blocks/table/src/table-cell.ts

@@ -647,16 +647,6 @@ export class TableCell extends SignalWatcher(
     return this.richText$.value?.inlineEditor;
   }
 
-  private readonly _handleKeyDown = (e: KeyboardEvent) => {
-    if (e.key !== 'Escape') {
-      if (e.key === 'Tab') {
-        e.preventDefault();
-        return;
-      }
-      e.stopPropagation();
-    }
-  };
-
   override connectedCallback() {
     super.connectedCallback();
     if (this.readonly) {
@@ -669,7 +659,10 @@ export class TableCell extends SignalWatcher(
         this.inlineEditor?.selectAll();
       }
     };
-    this.disposables.addFromEvent(this, 'keydown', selectAll);
+    this.addEventListener('keydown', selectAll);
+    this.disposables.add(() => {
+      this.removeEventListener('keydown', selectAll);
+    });
     this.disposables.addFromEvent(this, 'click', (e: MouseEvent) => {
       e.stopPropagation();
       requestAnimationFrame(() => {
@@ -686,13 +679,6 @@ export class TableCell extends SignalWatcher(
     }
     this.richText$.value?.updateComplete
       .then(() => {
-        const inlineEditor = this.inlineEditor;
-        if (inlineEditor) {
-          this.disposables.add(
-            inlineEditor.slots.keydown.subscribe(this._handleKeyDown)
-          );
-        }
-
         this.disposables.add(
           effect(() => {
             const richText = this.richText$.value;

blocksuite/affine/components/src/embed-card-modal/embed-card-edit-modal.ts

@@ -195,7 +195,8 @@ export class EmbedCardEditModal extends SignalWatcher(
 
     const description = this.description$.value.trim();
 
-    const props: AliasInfo = { title, description };
+    const props: AliasInfo = { title };
+    if (description) props.description = description;
 
     this.onSave?.(std, blockComponent, props);
 

blocksuite/affine/components/src/open-doc-dropdown-menu/dropdown-menu.ts

@@ -29,6 +29,12 @@ export class OpenDocDropdownMenu extends SignalWatcher(
       gap: unset !important;
     }
 
+    editor-icon-button {
+      .label {
+        font-weight: 400;
+      }
+    }
+
     div[data-orientation] {
       width: 264px;
       gap: 4px;

blocksuite/affine/components/src/toolbar/styles.ts

@@ -9,7 +9,6 @@ const toolbarColorKeys: Array<keyof AffineCssVariables> = [
   '--affine-background-overlay-panel-color',
   '--affine-v2-layer-background-overlayPanel' as never,
   '--affine-v2-layer-insideBorder-blackBorder' as never,
-  '--affine-v2-icon-primary' as never,
   '--affine-background-error-color',
   '--affine-background-primary-color',
   '--affine-background-tertiary-color',

blocksuite/affine/data-view/src/core/group-by/trait.ts

@@ -112,10 +112,7 @@ export class GroupTrait {
       return;
     }
     const { staticMap, groupInfo } = staticInfo;
-    const groupMap: Record<string, Group> = {};
-    Object.entries(staticMap).forEach(([key, group]) => {
-      groupMap[key] = new Group(key, group.value, groupInfo, this);
-    });
+    const groupMap: Record<string, Group> = { ...staticMap };
     this.view.rows$.value.forEach(row => {
       const value = this.view.cellGetOrCreate(row.rowId, groupInfo.property.id)
         .jsonValue$.value;
@@ -185,7 +182,6 @@ export class GroupTrait {
   ) {}
 
   addToGroup(rowId: string, key: string) {
-    this.view.lockRows(false);
     const groupMap = this.groupDataMap$.value;
     const groupInfo = this.groupInfo$.value;
     if (!groupMap || !groupInfo) {
@@ -258,7 +254,6 @@ export class GroupTrait {
     toGroupKey: string,
     position: InsertToPosition
   ) {
-    this.view.lockRows(false);
     const groupMap = this.groupDataMap$.value;
     if (!groupMap) {
       return;
@@ -295,7 +290,6 @@ export class GroupTrait {
   }
 
   moveGroupTo(groupKey: string, position: InsertToPosition) {
-    this.view.lockRows(false);
     const groups = this.groupsDataList$.value;
     if (!groups) {
       return;
@@ -311,7 +305,6 @@ export class GroupTrait {
   }
 
   removeFromGroup(rowId: string, key: string) {
-    this.view.lockRows(false);
     const groupMap = this.groupDataMap$.value;
     if (!groupMap) {
       return;
@@ -330,7 +323,6 @@ export class GroupTrait {
   }
 
   updateValue(rows: string[], value: unknown) {
-    this.view.lockRows(false);
     const propertyId = this.property$.value?.id;
     if (!propertyId) {
       return;

blocksuite/affine/data-view/src/core/view-manager/single-view.ts

@@ -128,7 +128,6 @@ export abstract class SingleViewBase<
   );
 
   rowsDelete(rows: string[]): void {
-    this.lockRows(false);
     this.dataSource.rowDelete(rows);
   }
 
@@ -259,7 +258,6 @@ export abstract class SingleViewBase<
   abstract propertyGetOrCreate(propertyId: string): Property;
 
   rowAdd(insertPosition: InsertToPosition | number): string {
-    this.lockRows(false);
     return this.dataSource.rowAdd(insertPosition);
   }
 

blocksuite/affine/data-view/src/view-presets/kanban/mobile/group.ts

@@ -61,12 +61,10 @@ export class MobileKanbanGroup extends SignalWatcher(
 
   private readonly clickAddCard = () => {
     this.view.addCard('end', this.group.key);
-    this.requestUpdate();
   };
 
   private readonly clickAddCardInStart = () => {
     this.view.addCard('start', this.group.key);
-    this.requestUpdate();
   };
 
   private readonly clickGroupOptions = (e: MouseEvent) => {
@@ -81,14 +79,12 @@ export class MobileKanbanGroup extends SignalWatcher(
               this.group.rows.forEach(row => {
                 this.group.manager.removeFromGroup(row.rowId, this.group.key);
               });
-              this.requestUpdate();
             },
           }),
           menu.action({
             name: 'Delete Cards',
             select: () => {
               this.view.rowsDelete(this.group.rows.map(row => row.rowId));
-              this.requestUpdate();
             },
           }),
         ],

blocksuite/affine/data-view/src/view-presets/kanban/mobile/kanban-view-ui-logic.ts

@@ -66,9 +66,7 @@ export class MobileKanbanViewUILogic extends DataViewUILogicBase<
 
   addRow = (position: InsertToPosition) => {
     if (this.readonly) return;
-    const id = this.view.rowAdd(position);
-    this.ui$.value?.requestUpdate();
-    return id;
+    return this.view.rowAdd(position);
   };
 
   focusFirstCell = () => {};

blocksuite/affine/data-view/src/view-presets/kanban/mobile/menu.ts

@@ -83,7 +83,6 @@ export const popCardMenu = (
               { before: true, id: cardId },
               groupKey
             );
-            kanbanViewLogic.ui$.value?.requestUpdate();
           },
         }),
         menu.action({
@@ -98,7 +97,6 @@ export const popCardMenu = (
               { before: false, id: cardId },
               groupKey
             );
-            kanbanViewLogic.ui$.value?.requestUpdate();
           },
         }),
       ],
@@ -113,7 +111,6 @@ export const popCardMenu = (
           prefix: DeleteIcon(),
           select: () => {
             kanbanViewLogic.view.rowsDelete([cardId]);
-            kanbanViewLogic.ui$.value?.requestUpdate();
           },
         }),
       ],

blocksuite/affine/data-view/src/view-presets/kanban/pc/controller/selection.ts

@@ -128,7 +128,6 @@ export class KanbanSelectionController implements ReactiveController {
     if (selection.selectionType === 'card') {
       this.view.rowsDelete(selection.cards.map(v => v.cardId));
       this.selection = undefined;
-      this.logic.ui$.value?.requestUpdate();
     }
   }
 

blocksuite/affine/data-view/src/view-presets/kanban/pc/group.ts

@@ -110,7 +110,6 @@ export class KanbanGroup extends SignalWatcher(
         isEditing: true,
       };
     });
-    this.requestUpdate();
   };
 
   private readonly clickAddCardInStart = () => {
@@ -128,7 +127,6 @@ export class KanbanGroup extends SignalWatcher(
         isEditing: true,
       };
     });
-    this.requestUpdate();
   };
 
   private readonly clickGroupOptions = (e: MouseEvent) => {
@@ -141,14 +139,12 @@ export class KanbanGroup extends SignalWatcher(
           this.group.rows.forEach(row => {
             this.group.manager.removeFromGroup(row.rowId, this.group.key);
           });
-          this.requestUpdate();
         },
       }),
       menu.action({
         name: 'Delete Cards',
         select: () => {
           this.view.rowsDelete(this.group.rows.map(row => row.rowId));
-          this.requestUpdate();
         },
       }),
     ]);

blocksuite/affine/data-view/src/view-presets/kanban/pc/kanban-view-ui-logic.ts

@@ -73,7 +73,6 @@ export class KanbanViewUILogic extends DataViewUILogicBase<
         rowId,
       });
     }
-    this.ui$.value?.requestUpdate();
     return rowId;
   };
 

blocksuite/affine/data-view/src/view-presets/table/mobile/group.ts

@@ -51,12 +51,10 @@ export class MobileTableGroup extends SignalWatcher(
 
   private readonly clickAddRow = () => {
     this.view.rowAdd('end', this.group?.key);
-    this.requestUpdate();
   };
 
   private readonly clickAddRowInStart = () => {
     this.view.rowAdd('start', this.group?.key);
-    this.requestUpdate();
   };
 
   private readonly clickGroupOptions = (e: MouseEvent) => {
@@ -79,7 +77,6 @@ export class MobileTableGroup extends SignalWatcher(
         name: 'Delete Cards',
         select: () => {
           this.view.rowsDelete(group.rows.map(row => row.rowId));
-          this.requestUpdate();
         },
       }),
     ]);

blocksuite/affine/data-view/src/view-presets/table/mobile/menu.ts

@@ -38,7 +38,6 @@ export const popMobileRowMenu = (
           prefix: DeleteIcon(),
           select: () => {
             view.rowsDelete([rowId]);
-            tableViewLogic.ui$.value?.requestUpdate();
           },
         }),
       ],

blocksuite/affine/data-view/src/view-presets/table/pc-virtual/controller/clipboard.ts

@@ -44,7 +44,6 @@ export class TableClipboardController implements ReactiveController {
       }
       if (deleteRows.length) {
         this.logic.view.rowsDelete(deleteRows);
-        this.logic.ui$.value?.requestUpdate();
       }
     }
     this.clipboard
@@ -80,14 +79,6 @@ export class TableClipboardController implements ReactiveController {
     const event = _context.get('clipboardState').raw;
     event.stopPropagation();
 
-    const active = document.activeElement as HTMLElement | null;
-    if (
-      active &&
-      (active.tagName === 'INPUT' || active.tagName === 'TEXTAREA')
-    ) {
-      return true;
-    }
-
     const clipboardData = event.clipboardData;
     if (!clipboardData) return;
 

blocksuite/affine/data-view/src/view-presets/table/pc-virtual/controller/hotkeys.ts

@@ -30,7 +30,6 @@ export class TableHotkeysController implements ReactiveController {
             const rows = TableViewRowSelection.rowsIds(selection);
             this.selectionController.selection = undefined;
             this.logic.view.rowsDelete(rows);
-            this.logic.ui$.value?.requestUpdate();
             return;
           }
           const {

blocksuite/affine/data-view/src/view-presets/table/pc-virtual/controller/selection.ts

@@ -376,7 +376,6 @@ export class TableSelectionController implements ReactiveController {
   deleteRow(rowId: string) {
     this.view.rowsDelete([rowId]);
     this.focusToCell('up');
-    this.logic.ui$.value?.requestUpdate();
   }
 
   focusFirstCell() {

blocksuite/affine/data-view/src/view-presets/table/pc-virtual/group/bottom/group-footer.ts

@@ -45,7 +45,6 @@ export class TableGroupFooter extends WithDisposable(ShadowlessElement) {
   private readonly clickAddRow = () => {
     const group = this.group$.value;
     const rowId = this.tableViewManager.rowAdd('end', group?.key);
-    this.requestUpdate();
 
     requestAnimationFrame(() => {
       const rowIndex = this.selectionController.getRow(group?.key, rowId)

blocksuite/affine/data-view/src/view-presets/table/pc-virtual/group/top/group-header.ts

@@ -58,7 +58,6 @@ export class TableGroupHeader extends SignalWatcher(
       return;
     }
     this.tableViewManager.rowAdd('start', group.key);
-    this.requestUpdate();
     const selectionController = this.selectionController;
     selectionController.selection = undefined;
     requestAnimationFrame(() => {
@@ -96,7 +95,6 @@ export class TableGroupHeader extends SignalWatcher(
         name: 'Delete Cards',
         select: () => {
           this.tableViewManager.rowsDelete(group.rows.map(row => row.rowId));
-          this.requestUpdate();
         },
       }),
     ]);

blocksuite/affine/data-view/src/view-presets/table/pc-virtual/row/menu.ts

@@ -71,7 +71,6 @@ export const popRowMenu = (
             prefix: DeleteIcon(),
             select: () => {
               selectionController.view.rowsDelete(rows);
-              selectionController.logic.ui$.value?.requestUpdate();
             },
           }),
         ],

blocksuite/affine/data-view/src/view-presets/table/pc/controller/clipboard.ts

@@ -43,7 +43,6 @@ export class TableClipboardController implements ReactiveController {
       }
       if (deleteRows.length) {
         this.logic.view.rowsDelete(deleteRows);
-        this.logic.ui$.value?.requestUpdate();
       }
     }
     this.clipboard
@@ -79,14 +78,6 @@ export class TableClipboardController implements ReactiveController {
     const event = _context.get('clipboardState').raw;
     event.stopPropagation();
 
-    const active = document.activeElement as HTMLElement | null;
-    if (
-      active &&
-      (active.tagName === 'INPUT' || active.tagName === 'TEXTAREA')
-    ) {
-      return true;
-    }
-
     const clipboardData = event.clipboardData;
     if (!clipboardData) return;
 

blocksuite/affine/data-view/src/view-presets/table/pc/controller/hotkeys.ts

@@ -28,7 +28,6 @@ export class TableHotkeysController implements ReactiveController {
             const rows = TableViewRowSelection.rowsIds(selection);
             this.selectionController.selection = undefined;
             this.logic.view.rowsDelete(rows);
-            this.logic.ui$.value?.requestUpdate();
             return;
           }
           const {

blocksuite/affine/data-view/src/view-presets/table/pc/controller/selection.ts

@@ -351,7 +351,6 @@ export class TableSelectionController implements ReactiveController {
   deleteRow(rowId: string) {
     this.view.rowsDelete([rowId]);
     this.focusToCell('up');
-    this.logic.ui$.value?.requestUpdate();
   }
 
   focusFirstCell() {

blocksuite/affine/data-view/src/view-presets/table/pc/group.ts

@@ -83,7 +83,6 @@ export class TableGroup extends SignalWatcher(
         },
         isEditing: true,
       });
-      this.requestUpdate();
     });
   };
 
@@ -103,7 +102,6 @@ export class TableGroup extends SignalWatcher(
         },
         isEditing: true,
       });
-      this.requestUpdate();
     });
   };
 
@@ -127,7 +125,6 @@ export class TableGroup extends SignalWatcher(
         name: 'Delete Cards',
         select: () => {
           this.view.rowsDelete(group.rows.map(row => row.rowId));
-          this.requestUpdate();
         },
       }),
     ]);

blocksuite/affine/data-view/src/view-presets/table/pc/menu.ts

@@ -71,7 +71,6 @@ export const popRowMenu = (
             prefix: DeleteIcon(),
             select: () => {
               selectionController.view.rowsDelete(rows);
-              selectionController.logic.ui$.value?.requestUpdate();
             },
           }),
         ],

blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/index.ts

@@ -16,6 +16,5 @@ export const renderFilterBar = (props: DataViewWidgetProps) => {
     .vars="${filterTrait.view.vars$}"
     .filterGroup="${filterTrait.filter$}"
     .onChange="${filterTrait.filterSet}"
-    .dataViewLogic="${props.dataViewLogic}"
   ></filter-bar>`;
 };

blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/list-view.ts

@@ -16,7 +16,6 @@ import { property } from 'lit/decorators.js';
 import type { Variable } from '../../../core/expression/types.js';
 import type { Filter, FilterGroup } from '../../../core/filter/types.js';
 import { popCreateFilter } from '../../../core/index.js';
-import type { DataViewUILogicBase } from '../../../core/view/data-view-base.js';
 import { popFilterGroup } from './group-panel-view.js';
 
 export class FilterBar extends SignalWatcher(ShadowlessElement) {
@@ -100,7 +99,6 @@ export class FilterBar extends SignalWatcher(ShadowlessElement) {
         requestAnimationFrame(() => {
           this.expandGroup(element, index);
         });
-        this.dataViewLogic.eventTrace('CreateDatabaseFilter', {});
       },
     });
   };
@@ -208,9 +206,6 @@ export class FilterBar extends SignalWatcher(ShadowlessElement) {
 
   @property({ attribute: false })
   accessor vars!: ReadonlySignal<Variable[]>;
-
-  @property({ attribute: false })
-  accessor dataViewLogic!: DataViewUILogicBase;
 }
 
 declare global {

blocksuite/affine/data-view/src/widget-presets/quick-setting-bar/filter/root-panel-view.ts

@@ -26,10 +26,7 @@ import { repeat } from 'lit/directives/repeat.js';
 import type { Variable } from '../../../core/expression/types.js';
 import type { FilterTrait } from '../../../core/filter/trait.js';
 import type { Filter, FilterGroup } from '../../../core/filter/types.js';
-import {
-  type DataViewUILogicBase,
-  popCreateFilter,
-} from '../../../core/index.js';
+import { popCreateFilter } from '../../../core/index.js';
 import {
   type FilterGroupView,
   getDepth,
@@ -378,7 +375,6 @@ export const popFilterRoot = (
   props: {
     filterTrait: FilterTrait;
     onBack: () => void;
-    dataViewLogic: DataViewUILogicBase;
   }
 ) => {
   const filterTrait = props.filterTrait;
@@ -418,10 +414,6 @@ export const popFilterRoot = (
                         ...value,
                         conditions: [...value.conditions, filter],
                       });
-                      props.dataViewLogic.eventTrace(
-                        'CreateDatabaseFilter',
-                        {}
-                      );
                     },
                   },
                   { middleware: subMenuMiddleware }

blocksuite/affine/data-view/src/widget-presets/tools/presets/filter/filter.ts

@@ -75,7 +75,6 @@ export class DataViewHeaderToolsFilter extends WidgetBase {
             conditions: [filter],
           };
           this.toggleShowFilter(true);
-          this.dataViewLogic.eventTrace('CreateDatabaseFilter', {});
         },
       }
     );

blocksuite/affine/data-view/src/widget-presets/tools/presets/view-options/view-options.ts

@@ -145,16 +145,13 @@ const createSettingMenus = (
                 popFilterRoot(target, {
                   filterTrait: filterTrait,
                   onBack: reopen,
-                  dataViewLogic: dataViewLogic,
                 });
-                dataViewLogic.eventTrace('CreateDatabaseFilter', {});
               },
             });
           } else {
             popFilterRoot(target, {
               filterTrait: filterTrait,
               onBack: reopen,
-              dataViewLogic: dataViewLogic,
             });
           }
         },

blocksuite/affine/foundation/src/view.ts

@@ -9,7 +9,6 @@ import {
 } from '@blocksuite/affine-ext-loader';
 import {
   AutoClearSelectionService,
-  CitationService,
   DefaultOpenDocExtension,
   DNDAPIExtension,
   DocDisplayMetaService,
@@ -77,7 +76,6 @@ export class FoundationViewExtension extends ViewExtensionProvider<FoundationVie
       FileSizeLimitService,
       LinkPreviewCache,
       LinkPreviewService,
-      CitationService,
     ]);
     context.register(clipboardConfigs);
     if (this.isEdgeless(context.scope)) {

blocksuite/affine/fragments/doc-title/src/doc-title.ts

@@ -192,14 +192,10 @@ export class DocTitle extends WithDisposable(ShadowlessElement) {
       this._updateTitleInMeta();
       this.requestUpdate();
     };
-
-    if (this._rootModel) {
-      const rootModel = this._rootModel;
-      rootModel.props.title.yText.observe(updateMetaTitle);
-      this._disposables.add(() => {
-        rootModel.props.title.yText.unobserve(updateMetaTitle);
-      });
-    }
+    this._rootModel?.props.title.yText.observe(updateMetaTitle);
+    this._disposables.add(() => {
+      this._rootModel?.props.title.yText.unobserve(updateMetaTitle);
+    });
   }
 
   override render() {

blocksuite/affine/gfx/pointer/src/snap/snap-manager.ts

@@ -1,6 +1,6 @@
 import { OverlayIdentifier } from '@blocksuite/affine-block-surface';
 import { MindmapElementModel } from '@blocksuite/affine-model';
-import { type Bound } from '@blocksuite/global/gfx';
+import { Bound } from '@blocksuite/global/gfx';
 import {
   type DragExtensionInitializeContext,
   type ExtensionDragMoveContext,
@@ -74,63 +74,47 @@ export class SnapExtension extends InteractivityExtension {
         return {};
       }
 
+      let alignBound: Bound | null = null;
+
       return {
         onResizeStart(context) {
-          snapOverlay.setMovingElements(context.elements);
+          alignBound = snapOverlay.setMovingElements(context.elements);
         },
         onResizeMove(context) {
-          const {
-            handle,
-            originalBound,
-            scaleX,
-            scaleY,
-            handleSign,
-            currentHandlePos,
-            elements,
-          } = context;
-          const rotate = elements.length > 1 ? 0 : elements[0].rotate;
-          const alignDirection: ('vertical' | 'horizontal')[] = [];
-          let switchDirection = false;
-          let nx = handleSign.x;
-          let ny = handleSign.y;
-
-          if (handle.length > 6) {
-            alignDirection.push('vertical', 'horizontal');
-          } else if (rotate % 90 === 0) {
-            nx =
-              handleSign.x * Math.cos((rotate / 180) * Math.PI) -
-              handleSign.y * Math.sin((rotate / 180) * Math.PI);
-            ny =
-              handleSign.x * Math.sin((rotate / 180) * Math.PI) +
-              handleSign.y * Math.cos((rotate / 180) * Math.PI);
-
-            if (Math.abs(nx) > Math.abs(ny)) {
-              alignDirection.push('horizontal');
-            } else {
-              alignDirection.push('vertical');
-            }
-
-            if (rotate % 180 !== 0) {
-              switchDirection = true;
-            }
+          if (!alignBound || alignBound.w === 0 || alignBound.h === 0) {
+            return;
           }
 
-          if (alignDirection.length > 0) {
-            const rst = snapOverlay.alignResize(
-              currentHandlePos,
-              alignDirection
+          const { handle, handleSign, lockRatio } = context;
+          let { dx, dy } = context;
+
+          if (lockRatio) {
+            const min = Math.min(
+              Math.abs(dx / alignBound.w),
+              Math.abs(dy / alignBound.h)
             );
 
-            const dx = switchDirection ? ny * rst.dy : nx * rst.dx;
-            const dy = switchDirection ? nx * rst.dx : ny * rst.dy;
-
-            context.suggest({
-              scaleX: scaleX + dx / originalBound.w,
-              scaleY: scaleY + dy / originalBound.h,
-            });
+            dx = min * Math.sign(dx) * alignBound.w;
+            dy = min * Math.sign(dy) * alignBound.h;
           }
+
+          const currentBound = new Bound(
+            alignBound.x +
+              (handle.includes('left') ? -dx * handleSign.xSign : 0),
+            alignBound.y +
+              (handle.includes('top') ? -dy * handleSign.ySign : 0),
+            Math.abs(alignBound.w + dx * handleSign.xSign),
+            Math.abs(alignBound.h + dy * handleSign.ySign)
+          );
+          const alignRst = snapOverlay.align(currentBound);
+
+          context.suggest({
+            dx: alignRst.dx + context.dx,
+            dy: alignRst.dy + context.dy,
+          });
         },
         onResizeEnd() {
+          alignBound = null;
           snapOverlay.clear();
         },
       };

blocksuite/affine/gfx/pointer/src/snap/snap-overlay.ts

@@ -3,7 +3,7 @@ import {
   ConnectorElementModel,
   MindmapElementModel,
 } from '@blocksuite/affine-model';
-import { almostEqual, Bound, type IVec, Point } from '@blocksuite/global/gfx';
+import { almostEqual, Bound, Point } from '@blocksuite/global/gfx';
 import type { GfxModel } from '@blocksuite/std/gfx';
 
 interface Distance {
@@ -586,60 +586,6 @@ export class SnapOverlay extends Overlay {
     );
   }
 
-  alignResize(position: IVec, direction: ('vertical' | 'horizontal')[]) {
-    const rst = { dx: 0, dy: 0 };
-
-    const { viewport } = this.gfx;
-    const threshold = ALIGN_THRESHOLD / viewport.zoom;
-    const searchBound = new Bound(
-      position[0] - threshold / 2,
-      position[1] - threshold / 2,
-      threshold,
-      threshold
-    );
-    const alignBound = new Bound(position[0], position[1], 0, 0);
-
-    this._intraGraphicAlignLines = {
-      horizontal: [],
-      vertical: [],
-    };
-    this._distributedAlignLines = [];
-    this._updateAlignCandidates(searchBound);
-
-    for (const other of this._referenceBounds.all) {
-      const closestDistances = this._calculateClosestDistances(
-        alignBound,
-        other
-      );
-
-      if (
-        direction.includes('horizontal') &&
-        closestDistances.horiz &&
-        (!this._intraGraphicAlignLines.horizontal.length ||
-          Math.abs(closestDistances.horiz.distance) < Math.abs(rst.dx))
-      ) {
-        this._updateXAlignPoint(rst, alignBound, other, closestDistances);
-      }
-
-      if (
-        direction.includes('vertical') &&
-        closestDistances.vert &&
-        (!this._intraGraphicAlignLines.vertical.length ||
-          Math.abs(closestDistances.vert.distance) < Math.abs(rst.dy))
-      ) {
-        this._updateYAlignPoint(rst, alignBound, other, closestDistances);
-      }
-    }
-
-    this._intraGraphicAlignLines.horizontal =
-      this._intraGraphicAlignLines.horizontal.slice(0, 1);
-    this._intraGraphicAlignLines.vertical =
-      this._intraGraphicAlignLines.vertical.slice(0, 1);
-    this._renderer?.refresh();
-
-    return rst;
-  }
-
   align(bound: Bound): { dx: number; dy: number } {
     const rst = { dx: 0, dy: 0 };
     const threshold = ALIGN_THRESHOLD / this.gfx.viewport.zoom;

blocksuite/affine/gfx/shape/src/element-renderer/shape-dom/index.ts

@@ -9,35 +9,18 @@ function applyShapeSpecificStyles(
   element: HTMLElement,
   zoom: number
 ) {
-  // Reset properties that might be set by different shape types
-  element.style.removeProperty('clip-path');
-  element.style.removeProperty('border-radius');
-  // Clear DOM for shapes that don't use SVG, or if type changes from SVG-based to non-SVG-based
-  if (model.shapeType !== 'diamond' && model.shapeType !== 'triangle') {
-    while (element.firstChild) element.firstChild.remove();
+  if (model.shapeType === 'rect') {
+    const w = model.w * zoom;
+    const h = model.h * zoom;
+    const r = model.radius ?? 0;
+    const borderRadius =
+      r < 1 ? `${Math.min(w * r, h * r)}px` : `${r * zoom}px`;
+    element.style.borderRadius = borderRadius;
+  } else if (model.shapeType === 'ellipse') {
+    element.style.borderRadius = '50%';
+  } else {
+    element.style.borderRadius = '';
   }
-
-  switch (model.shapeType) {
-    case 'rect': {
-      const w = model.w * zoom;
-      const h = model.h * zoom;
-      const r = model.radius ?? 0;
-      const borderRadius =
-        r < 1 ? `${Math.min(w * r, h * r)}px` : `${r * zoom}px`;
-      element.style.borderRadius = borderRadius;
-      break;
-    }
-    case 'ellipse':
-      element.style.borderRadius = '50%';
-      break;
-    case 'diamond':
-      element.style.clipPath = 'polygon(50% 0%, 100% 50%, 50% 100%, 0% 50%)';
-      break;
-    case 'triangle':
-      element.style.clipPath = 'polygon(50% 0%, 100% 100%, 0% 100%)';
-      break;
-  }
-  // No 'else' needed to clear styles, as they are reset at the beginning of the function.
 }
 
 function applyBorderStyles(
@@ -95,9 +78,6 @@ export const shapeDomRenderer = (
   renderer: DomRenderer
 ): void => {
   const { zoom } = renderer.viewport;
-  const unscaledWidth = model.w;
-  const unscaledHeight = model.h;
-
   const fillColor = renderer.getColorValue(
     model.fillColor,
     DefaultTheme.shapeFillColor,
@@ -109,80 +89,17 @@ export const shapeDomRenderer = (
     true
   );
 
-  element.style.width = `${unscaledWidth * zoom}px`;
-  element.style.height = `${unscaledHeight * zoom}px`;
-  element.style.boxSizing = 'border-box';
+  element.style.width = `${model.w * zoom}px`;
+  element.style.height = `${model.h * zoom}px`;
 
-  // Apply shape-specific clipping, border-radius, and potentially clear innerHTML
   applyShapeSpecificStyles(model, element, zoom);
 
-  if (model.shapeType === 'diamond' || model.shapeType === 'triangle') {
-    // For diamond and triangle, fill and border are handled by inline SVG
-    element.style.border = 'none'; // Ensure no standard CSS border interferes
-    element.style.backgroundColor = 'transparent'; // Host element is transparent
-
-    const strokeW = model.strokeWidth;
-    const halfStroke = strokeW / 2; // Calculate half stroke width for point adjustment
-
-    let svgPoints = '';
-    if (model.shapeType === 'diamond') {
-      // Adjusted points for diamond
-      svgPoints = [
-        `${unscaledWidth / 2},${halfStroke}`,
-        `${unscaledWidth - halfStroke},${unscaledHeight / 2}`,
-        `${unscaledWidth / 2},${unscaledHeight - halfStroke}`,
-        `${halfStroke},${unscaledHeight / 2}`,
-      ].join(' ');
-    } else {
-      // triangle
-      // Adjusted points for triangle
-      svgPoints = [
-        `${unscaledWidth / 2},${halfStroke}`,
-        `${unscaledWidth - halfStroke},${unscaledHeight - halfStroke}`,
-        `${halfStroke},${unscaledHeight - halfStroke}`,
-      ].join(' ');
-    }
-
-    // Determine if stroke should be visible and its color
-    const finalStrokeColor =
-      model.strokeStyle !== 'none' && strokeW > 0 ? strokeColor : 'transparent';
-    // Determine dash array, only if stroke is visible and style is 'dash'
-    const finalStrokeDasharray =
-      model.strokeStyle === 'dash' && finalStrokeColor !== 'transparent'
-        ? '12, 12'
-        : 'none';
-    // Determine fill color
-    const finalFillColor = model.filled ? fillColor : 'transparent';
-
-    // Build SVG safely with DOM-API
-    const SVG_NS = 'http://www.w3.org/2000/svg';
-    const svg = document.createElementNS(SVG_NS, 'svg');
-    svg.setAttribute('width', '100%');
-    svg.setAttribute('height', '100%');
-    svg.setAttribute('viewBox', `0 0 ${unscaledWidth} ${unscaledHeight}`);
-    svg.setAttribute('preserveAspectRatio', 'none');
-
-    const polygon = document.createElementNS(SVG_NS, 'polygon');
-    polygon.setAttribute('points', svgPoints);
-    polygon.setAttribute('fill', finalFillColor);
-    polygon.setAttribute('stroke', finalStrokeColor);
-    polygon.setAttribute('stroke-width', String(strokeW));
-    if (finalStrokeDasharray !== 'none') {
-      polygon.setAttribute('stroke-dasharray', finalStrokeDasharray);
-    }
-    svg.append(polygon);
-
-    // Replace existing children to avoid memory leaks
-    element.replaceChildren(svg);
-  } else {
-    // Standard rendering for other shapes (e.g., rect, ellipse)
-    // innerHTML was already cleared by applyShapeSpecificStyles if necessary
-    element.style.backgroundColor = model.filled ? fillColor : 'transparent';
-    applyBorderStyles(model, element, strokeColor, zoom); // Uses standard CSS border
-  }
+  element.style.backgroundColor = model.filled ? fillColor : 'transparent';
 
+  applyBorderStyles(model, element, strokeColor, zoom);
   applyTransformStyles(model, element);
 
+  element.style.boxSizing = 'border-box';
   element.style.zIndex = renderer.layerManager.getZIndex(model).toString();
 
   manageClassNames(model, element);

blocksuite/affine/inlines/footnote/src/footnote-node/footnote-node.ts

@@ -1,7 +1,6 @@
 import { HoverController } from '@blocksuite/affine-components/hover';
 import { PeekViewProvider } from '@blocksuite/affine-components/peek';
 import type { FootNote } from '@blocksuite/affine-model';
-import { CitationProvider } from '@blocksuite/affine-shared/services';
 import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
 import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
 import { WithDisposable } from '@blocksuite/global/lit';
@@ -118,10 +117,6 @@ export class AffineFootnoteNode extends WithDisposable(ShadowlessElement) {
     return this.std.store.readonly;
   }
 
-  get citationService() {
-    return this.std.get(CitationProvider);
-  }
-
   onFootnoteClick = () => {
     if (!this.footnote) {
       return;
@@ -220,10 +215,6 @@ export class AffineFootnoteNode extends WithDisposable(ShadowlessElement) {
         return null;
       }
 
-      this.citationService.trackEvent('Hover', {
-        control: 'Source Footnote',
-      });
-
       return {
         template: this._FootNotePopup(footnote, abortController),
         container: this.std.host,

blocksuite/affine/inlines/latex/src/latex-node/latex-node.ts

@@ -188,8 +188,6 @@ export class AffineLatexNode extends SignalWatcher(
     this._editorAbortController?.abort();
     this._editorAbortController = new AbortController();
 
-    blockComponent.selection.setGroup('note', []);
-
     const portal = createLitPortal({
       template: html`<latex-editor-menu
         .std=${this.std}

blocksuite/affine/inlines/latex/src/markdown.ts

@@ -10,7 +10,7 @@ export const LatexExtension = InlineMarkdownExtension<AffineTextAttributes>({
   name: 'latex',
 
   pattern:
-    /(?:\$\$)(?<content>[^$]+)(?:\$\$)\s$|(?<blockPrefix>\$\$\$\$)\s$|(?<inlinePrefix>\$\$)\s$/g,
+    /(?:\$\$)(?<content>[^$]+)(?:\$\$)$|(?<blockPrefix>\$\$\$\$)|(?<inlinePrefix>\$\$)$/g,
   action: ({ inlineEditor, prefixText, inlineRange, pattern, undoManager }) => {
     const match = pattern.exec(prefixText);
     if (!match || !match.groups) return;
@@ -33,10 +33,22 @@ export const LatexExtension = InlineMarkdownExtension<AffineTextAttributes>({
     const ifEdgelessText = blockComponent.closest('affine-edgeless-text');
 
     if (blockPrefix === '$$$$') {
+      inlineEditor.insertText(
+        {
+          index: inlineRange.index,
+          length: 0,
+        },
+        ' '
+      );
+      inlineEditor.setInlineRange({
+        index: inlineRange.index + 1,
+        length: 0,
+      });
+
       undoManager.stopCapturing();
 
       inlineEditor.deleteText({
-        index: inlineRange.index - 5,
+        index: inlineRange.index - 4,
         length: 5,
       });
 
@@ -76,22 +88,34 @@ export const LatexExtension = InlineMarkdownExtension<AffineTextAttributes>({
     }
 
     if (inlinePrefix === '$$') {
+      inlineEditor.insertText(
+        {
+          index: inlineRange.index,
+          length: 0,
+        },
+        ' '
+      );
+      inlineEditor.setInlineRange({
+        index: inlineRange.index + 1,
+        length: 0,
+      });
+
       undoManager.stopCapturing();
 
       inlineEditor.deleteText({
-        index: inlineRange.index - 3,
+        index: inlineRange.index - 2,
         length: 3,
       });
       inlineEditor.insertText(
         {
-          index: inlineRange.index - 3,
+          index: inlineRange.index - 2,
           length: 0,
         },
         ' '
       );
       inlineEditor.formatText(
         {
-          index: inlineRange.index - 3,
+          index: inlineRange.index - 2,
           length: 1,
         },
         {
@@ -105,7 +129,7 @@ export const LatexExtension = InlineMarkdownExtension<AffineTextAttributes>({
           await inlineEditor.waitForUpdate();
 
           const textPoint = inlineEditor.getTextPoint(
-            inlineRange.index - 3 + 1
+            inlineRange.index - 2 + 1
           );
           if (!textPoint) return;
 
@@ -135,9 +159,21 @@ export const LatexExtension = InlineMarkdownExtension<AffineTextAttributes>({
 
     if (!content || content.length === 0) return;
 
+    inlineEditor.insertText(
+      {
+        index: inlineRange.index,
+        length: 0,
+      },
+      ' '
+    );
+    inlineEditor.setInlineRange({
+      index: inlineRange.index + 1,
+      length: 0,
+    });
+
     undoManager.stopCapturing();
 
-    const startIndex = inlineRange.index - 1 - 2 - content.length - 2;
+    const startIndex = inlineRange.index - 2 - content.length - 2;
     inlineEditor.deleteText({
       index: startIndex,
       length: 2 + content.length + 2 + 1,

blocksuite/affine/inlines/link/src/markdown.ts

@@ -3,18 +3,27 @@ import { InlineMarkdownExtension } from '@blocksuite/std/inline';
 
 export const LinkExtension = InlineMarkdownExtension<AffineTextAttributes>({
   name: 'link',
-  pattern: /.*\[(.+?)\]\((.+?)\)\s$/,
+  pattern: /.*\[(.+?)\]\((.+?)\)$/,
   action: ({ inlineEditor, prefixText, inlineRange, pattern, undoManager }) => {
     const match = prefixText.match(pattern);
     if (!match) return;
 
     const linkText = match[1];
     const linkUrl = match[2];
-    const annotatedText = match[0].slice(
-      -(linkText.length + linkUrl.length + 4 + 1),
-      -1
+    const annotatedText = match[0].slice(-linkText.length - linkUrl.length - 4);
+    const startIndex = inlineRange.index - annotatedText.length;
+
+    inlineEditor.insertText(
+      {
+        index: inlineRange.index,
+        length: 0,
+      },
+      ' '
     );
-    const startIndex = inlineRange.index - annotatedText.length - 1;
+    inlineEditor.setInlineRange({
+      index: inlineRange.index + 1,
+      length: 0,
+    });
 
     undoManager.stopCapturing();
 

blocksuite/affine/inlines/preset/src/inline-spec.ts

@@ -59,7 +59,7 @@ export const StrikeInlineSpecExtension =
 
 export const CodeInlineSpecExtension =
   InlineSpecExtension<AffineTextAttributes>({
-    name: 'inline-code',
+    name: 'code',
     schema: z.literal(true).optional().nullable().catch(undefined),
     match: delta => {
       return !!delta.attributes?.code;

blocksuite/affine/inlines/preset/src/markdown.ts

@@ -13,7 +13,7 @@ import type { ExtensionType } from '@blocksuite/store';
 export const BoldItalicMarkdown = InlineMarkdownExtension<AffineTextAttributes>(
   {
     name: 'bolditalic',
-    pattern: /.*\*{3}([^\s*][^*]*[^\s*])\*{3}\s$|.*\*{3}([^\s*])\*{3}\s$/,
+    pattern: /.*\*{3}([^\s*][^*]*[^\s*])\*{3}$|.*\*{3}([^\s*])\*{3}$/,
     action: ({
       inlineEditor,
       prefixText,
@@ -25,11 +25,20 @@ export const BoldItalicMarkdown = InlineMarkdownExtension<AffineTextAttributes>(
       if (!match) return;
 
       const targetText = match[1] ?? match[2];
-      const annotatedText = match[0].slice(
-        -(targetText.length + 3 * 2 + 1),
-        -1
+      const annotatedText = match[0].slice(-targetText.length - 3 * 2);
+      const startIndex = inlineRange.index - annotatedText.length;
+
+      inlineEditor.insertText(
+        {
+          index: startIndex + annotatedText.length,
+          length: 0,
+        },
+        ' '
       );
-      const startIndex = inlineRange.index - annotatedText.length - 1;
+      inlineEditor.setInlineRange({
+        index: startIndex + annotatedText.length + 1,
+        length: 0,
+      });
 
       undoManager.stopCapturing();
 
@@ -45,13 +54,18 @@ export const BoldItalicMarkdown = InlineMarkdownExtension<AffineTextAttributes>(
       );
 
       inlineEditor.deleteText({
-        index: inlineRange.index - 4,
-        length: 4,
+        index: startIndex + annotatedText.length,
+        length: 1,
+      });
+      inlineEditor.deleteText({
+        index: startIndex + annotatedText.length - 3,
+        length: 3,
       });
       inlineEditor.deleteText({
         index: startIndex,
         length: 3,
       });
+
       inlineEditor.setInlineRange({
         index: startIndex + annotatedText.length - 6,
         length: 0,
@@ -62,14 +76,26 @@ export const BoldItalicMarkdown = InlineMarkdownExtension<AffineTextAttributes>(
 
 export const BoldMarkdown = InlineMarkdownExtension<AffineTextAttributes>({
   name: 'bold',
-  pattern: /.*\*{2}([^\s][^*]*[^\s*])\*{2}\s$|.*\*{2}([^\s*])\*{2}\s$/,
+  pattern: /.*\*{2}([^\s][^*]*[^\s*])\*{2}$|.*\*{2}([^\s*])\*{2}$/,
   action: ({ inlineEditor, prefixText, inlineRange, pattern, undoManager }) => {
     const match = prefixText.match(pattern);
     if (!match) return;
 
     const targetText = match[1] ?? match[2];
-    const annotatedText = match[0].slice(-(targetText.length + 2 * 2 + 1), -1);
-    const startIndex = inlineRange.index - annotatedText.length - 1;
+    const annotatedText = match[0].slice(-targetText.length - 2 * 2);
+    const startIndex = inlineRange.index - annotatedText.length;
+
+    inlineEditor.insertText(
+      {
+        index: startIndex + annotatedText.length,
+        length: 0,
+      },
+      ' '
+    );
+    inlineEditor.setInlineRange({
+      index: startIndex + annotatedText.length + 1,
+      length: 0,
+    });
 
     undoManager.stopCapturing();
 
@@ -84,13 +110,18 @@ export const BoldMarkdown = InlineMarkdownExtension<AffineTextAttributes>({
     );
 
     inlineEditor.deleteText({
-      index: inlineRange.index - 3,
-      length: 3,
+      index: startIndex + annotatedText.length,
+      length: 1,
+    });
+    inlineEditor.deleteText({
+      index: startIndex + annotatedText.length - 2,
+      length: 2,
     });
     inlineEditor.deleteText({
       index: startIndex,
       length: 2,
     });
+
     inlineEditor.setInlineRange({
       index: startIndex + annotatedText.length - 4,
       length: 0,
@@ -100,14 +131,26 @@ export const BoldMarkdown = InlineMarkdownExtension<AffineTextAttributes>({
 
 export const ItalicExtension = InlineMarkdownExtension<AffineTextAttributes>({
   name: 'italic',
-  pattern: /.*\*{1}([^\s][^*]*[^\s*])\*{1}\s$|.*\*{1}([^\s*])\*{1}\s$/,
+  pattern: /.*\*{1}([^\s][^*]*[^\s*])\*{1}$|.*\*{1}([^\s*])\*{1}$/,
   action: ({ inlineEditor, prefixText, inlineRange, pattern, undoManager }) => {
     const match = prefixText.match(pattern);
     if (!match) return;
 
     const targetText = match[1] ?? match[2];
-    const annotatedText = match[0].slice(-(targetText.length + 1 * 2 + 1), -1);
-    const startIndex = inlineRange.index - annotatedText.length - 1;
+    const annotatedText = match[0].slice(-targetText.length - 1 * 2);
+    const startIndex = inlineRange.index - annotatedText.length;
+
+    inlineEditor.insertText(
+      {
+        index: startIndex + annotatedText.length,
+        length: 0,
+      },
+      ' '
+    );
+    inlineEditor.setInlineRange({
+      index: startIndex + annotatedText.length + 1,
+      length: 0,
+    });
 
     undoManager.stopCapturing();
 
@@ -122,13 +165,18 @@ export const ItalicExtension = InlineMarkdownExtension<AffineTextAttributes>({
     );
 
     inlineEditor.deleteText({
-      index: inlineRange.index - 2,
-      length: 2,
+      index: startIndex + annotatedText.length,
+      length: 1,
+    });
+    inlineEditor.deleteText({
+      index: startIndex + annotatedText.length - 1,
+      length: 1,
     });
     inlineEditor.deleteText({
       index: startIndex,
       length: 1,
     });
+
     inlineEditor.setInlineRange({
       index: startIndex + annotatedText.length - 2,
       length: 0,
@@ -139,7 +187,7 @@ export const ItalicExtension = InlineMarkdownExtension<AffineTextAttributes>({
 export const StrikethroughExtension =
   InlineMarkdownExtension<AffineTextAttributes>({
     name: 'strikethrough',
-    pattern: /.*~{2}([^\s][^~]*[^\s])~{2}\s$|.*~{2}([^\s~])~{2}\s$/,
+    pattern: /.*~{2}([^\s][^~]*[^\s])~{2}$|.*~{2}([^\s~])~{2}$/,
     action: ({
       inlineEditor,
       prefixText,
@@ -151,11 +199,20 @@ export const StrikethroughExtension =
       if (!match) return;
 
       const targetText = match[1] ?? match[2];
-      const annotatedText = match[0].slice(
-        -targetText.length - (2 * 2 + 1),
-        -1
+      const annotatedText = match[0].slice(-targetText.length - 2 * 2);
+      const startIndex = inlineRange.index - annotatedText.length;
+
+      inlineEditor.insertText(
+        {
+          index: startIndex + annotatedText.length,
+          length: 0,
+        },
+        ' '
       );
-      const startIndex = inlineRange.index - annotatedText.length - 1;
+      inlineEditor.setInlineRange({
+        index: startIndex + annotatedText.length + 1,
+        length: 0,
+      });
 
       undoManager.stopCapturing();
 
@@ -170,8 +227,12 @@ export const StrikethroughExtension =
       );
 
       inlineEditor.deleteText({
-        index: inlineRange.index - 3,
-        length: 3,
+        index: startIndex + annotatedText.length,
+        length: 1,
+      });
+      inlineEditor.deleteText({
+        index: startIndex + annotatedText.length - 2,
+        length: 2,
       });
       inlineEditor.deleteText({
         index: startIndex,
@@ -188,7 +249,7 @@ export const StrikethroughExtension =
 export const UnderthroughExtension =
   InlineMarkdownExtension<AffineTextAttributes>({
     name: 'underthrough',
-    pattern: /.*~{1}([^\s][^~]*[^\s~])~{1}\s$|.*~{1}([^\s~])~{1}\s$/,
+    pattern: /.*~{1}([^\s][^~]*[^\s~])~{1}$|.*~{1}([^\s~])~{1}$/,
     action: ({
       inlineEditor,
       prefixText,
@@ -200,11 +261,20 @@ export const UnderthroughExtension =
       if (!match) return;
 
       const targetText = match[1] ?? match[2];
-      const annotatedText = match[0].slice(
-        -(targetText.length + 1 * 2 + 1),
-        -1
+      const annotatedText = match[0].slice(-targetText.length - 1 * 2);
+      const startIndex = inlineRange.index - annotatedText.length;
+
+      inlineEditor.insertText(
+        {
+          index: startIndex + annotatedText.length,
+          length: 0,
+        },
+        ' '
       );
-      const startIndex = inlineRange.index - annotatedText.length - 1;
+      inlineEditor.setInlineRange({
+        index: startIndex + annotatedText.length + 1,
+        length: 0,
+      });
 
       undoManager.stopCapturing();
 
@@ -219,8 +289,12 @@ export const UnderthroughExtension =
       );
 
       inlineEditor.deleteText({
-        index: inlineRange.index - 2,
-        length: 2,
+        index: startIndex + annotatedText.length,
+        length: 1,
+      });
+      inlineEditor.deleteText({
+        index: inlineRange.index - 1,
+        length: 1,
       });
       inlineEditor.deleteText({
         index: startIndex,
@@ -236,14 +310,26 @@ export const UnderthroughExtension =
 
 export const CodeExtension = InlineMarkdownExtension<AffineTextAttributes>({
   name: 'code',
-  pattern: /.*`([^\s][^`]*[^\s])`\s$|.*`([^\s`])`\s$/,
+  pattern: /.*`([^\s][^`]*[^\s])`$|.*`([^\s`])`$/,
   action: ({ inlineEditor, prefixText, inlineRange, pattern, undoManager }) => {
     const match = prefixText.match(pattern);
     if (!match) return;
 
     const targetText = match[1] ?? match[2];
-    const annotatedText = match[0].slice(-(targetText.length + 1 * 2 + 1), -1);
-    const startIndex = inlineRange.index - annotatedText.length - 1;
+    const annotatedText = match[0].slice(-targetText.length - 1 * 2);
+    const startIndex = inlineRange.index - annotatedText.length;
+
+    inlineEditor.insertText(
+      {
+        index: startIndex + annotatedText.length,
+        length: 0,
+      },
+      ' '
+    );
+    inlineEditor.setInlineRange({
+      index: startIndex + annotatedText.length + 1,
+      length: 0,
+    });
 
     undoManager.stopCapturing();
 
@@ -258,8 +344,12 @@ export const CodeExtension = InlineMarkdownExtension<AffineTextAttributes>({
     );
 
     inlineEditor.deleteText({
-      index: inlineRange.index - 2,
-      length: 2,
+      index: startIndex + annotatedText.length,
+      length: 1,
+    });
+    inlineEditor.deleteText({
+      index: startIndex + annotatedText.length - 1,
+      length: 1,
     });
     inlineEditor.deleteText({
       index: startIndex,

blocksuite/affine/model/src/blocks/attachment/attachment-model.ts

@@ -30,12 +30,11 @@ import { AttachmentBlockTransformer } from './attachment-transformer.js';
  */
 type BackwardCompatibleUndefined = undefined;
 
-export const AttachmentBlockStyles = [
+export const AttachmentBlockStyles: EmbedCardStyle[] = [
   'cubeThick',
   'horizontalThin',
   'pdf',
-  'citation',
-] as const satisfies EmbedCardStyle[];
+] as const;
 
 export type AttachmentBlockProps = {
   name: string;

blocksuite/affine/model/src/blocks/bookmark/bookmark-model.ts

@@ -15,13 +15,13 @@ import type {
   LinkPreviewData,
 } from '../../utils/index.js';
 
-export const BookmarkStyles = [
+export const BookmarkStyles: EmbedCardStyle[] = [
   'vertical',
   'horizontal',
   'list',
   'cube',
   'citation',
-] as const satisfies EmbedCardStyle[];
+] as const;
 
 export type BookmarkBlockProps = {
   style: (typeof BookmarkStyles)[number];

blocksuite/affine/model/src/blocks/embed/figma/figma-model.ts

@@ -8,7 +8,7 @@ export type EmbedFigmaBlockUrlData = {
   description: string | null;
 };
 
-export const EmbedFigmaStyles = ['figma'] as const satisfies EmbedCardStyle[];
+export const EmbedFigmaStyles: EmbedCardStyle[] = ['figma'] as const;
 
 export type EmbedFigmaBlockProps = {
   style: (typeof EmbedFigmaStyles)[number];

blocksuite/affine/model/src/blocks/embed/github/github-model.ts

@@ -13,12 +13,12 @@ export type EmbedGithubBlockUrlData = {
   assignees: string[] | null;
 };
 
-export const EmbedGithubStyles = [
+export const EmbedGithubStyles: EmbedCardStyle[] = [
   'vertical',
   'horizontal',
   'list',
   'cube',
-] as const satisfies EmbedCardStyle[];
+] as const;
 
 export type EmbedGithubBlockProps = {
   style: (typeof EmbedGithubStyles)[number];

blocksuite/affine/model/src/blocks/embed/html/html-model.ts

@@ -3,7 +3,7 @@ import { BlockModel } from '@blocksuite/store';
 import type { EmbedCardStyle } from '../../../utils/index.js';
 import { defineEmbedModel } from '../../../utils/index.js';
 
-export const EmbedHtmlStyles = ['html'] as const satisfies EmbedCardStyle[];
+export const EmbedHtmlStyles: EmbedCardStyle[] = ['html'] as const;
 
 export type EmbedHtmlBlockProps = {
   style: (typeof EmbedHtmlStyles)[number];

blocksuite/affine/model/src/blocks/embed/iframe/iframe-model.ts

@@ -7,7 +7,7 @@ import { BlockModel } from '@blocksuite/store';
 
 import { type EmbedCardStyle } from '../../../utils/index.js';
 
-export const EmbedIframeStyles = ['figma'] as const satisfies EmbedCardStyle[];
+export const EmbedIframeStyles: EmbedCardStyle[] = ['figma'] as const;
 
 export type EmbedIframeBlockProps = {
   url: string; // the original url that user input

blocksuite/affine/model/src/blocks/embed/linked-doc/linked-doc-model.ts

@@ -4,17 +4,17 @@ import type { ReferenceInfo } from '../../../consts/doc.js';
 import type { EmbedCardStyle } from '../../../utils/index.js';
 import { defineEmbedModel } from '../../../utils/index.js';
 
-export const EmbedLinkedDocStyles = [
+export const EmbedLinkedDocStyles: EmbedCardStyle[] = [
   'vertical',
   'horizontal',
   'list',
   'cube',
   'horizontalThin',
   'citation',
-] as const satisfies EmbedCardStyle[];
+];
 
 export type EmbedLinkedDocBlockProps = {
-  style: (typeof EmbedLinkedDocStyles)[number];
+  style: EmbedCardStyle;
   caption: string | null;
   footnoteIdentifier: string | null;
 } & ReferenceInfo;

blocksuite/affine/model/src/blocks/embed/loom/loom-model.ts

@@ -10,7 +10,7 @@ export type EmbedLoomBlockUrlData = {
   description: string | null;
 };
 
-export const EmbedLoomStyles = ['video'] as const satisfies EmbedCardStyle[];
+export const EmbedLoomStyles: EmbedCardStyle[] = ['video'] as const;
 
 export type EmbedLoomBlockProps = {
   style: (typeof EmbedLoomStyles)[number];

blocksuite/affine/model/src/blocks/embed/synced-doc/synced-doc-model.ts

@@ -5,9 +5,7 @@ import type { ReferenceInfo } from '../../../consts/doc.js';
 import type { EmbedCardStyle } from '../../../utils/index.js';
 import { defineEmbedModel } from '../../../utils/index.js';
 
-export const EmbedSyncedDocStyles = [
-  'syncedDoc',
-] as const satisfies EmbedCardStyle[];
+export const EmbedSyncedDocStyles: EmbedCardStyle[] = ['syncedDoc'];
 
 export type EmbedSyncedDocBlockProps = {
   style: EmbedCardStyle;

blocksuite/affine/model/src/blocks/embed/types.ts

@@ -1,7 +1,6 @@
 import type { GfxModel } from '@blocksuite/std/gfx';
 import type { BlockModel } from '@blocksuite/store';
 
-import type { BookmarkBlockModel } from '../bookmark';
 import { EmbedFigmaModel } from './figma';
 import { EmbedGithubModel } from './github';
 import type { EmbedHtmlModel } from './html';
@@ -31,10 +30,7 @@ export type EmbedCardModel = InstanceType<
   ExternalEmbedModel | InternalEmbedModel
 >;
 
-export type LinkableEmbedModel =
-  | EmbedCardModel
-  | EmbedIframeBlockModel
-  | BookmarkBlockModel;
+export type LinkableEmbedModel = EmbedCardModel | EmbedIframeBlockModel;
 
 export type BuiltInEmbedModel = EmbedCardModel | EmbedHtmlModel;
 

blocksuite/affine/model/src/blocks/embed/youtube/youtube-model.ts

@@ -13,7 +13,7 @@ export type EmbedYoutubeBlockUrlData = {
   creatorImage: string | null;
 };
 
-export const EmbedYoutubeStyles = ['video'] as const satisfies EmbedCardStyle[];
+export const EmbedYoutubeStyles: EmbedCardStyle[] = ['video'] as const;
 
 export type EmbedYoutubeBlockProps = {
   style: (typeof EmbedYoutubeStyles)[number];

blocksuite/affine/rich-text/src/index.ts

@@ -10,5 +10,6 @@ export {
   onModelTextUpdated,
   selectTextModel,
 } from './dom';
+export { markdownInput } from './markdown';
 export { RichText } from './rich-text';
 export * from './utils';

blocksuite/affine/rich-text/src/markdown/divider.ts

@@ -0,0 +1,42 @@
+import {
+  DividerBlockModel,
+  ParagraphBlockModel,
+} from '@blocksuite/affine-model';
+import { matchModels } from '@blocksuite/affine-shared/utils';
+import type { BlockStdScope } from '@blocksuite/std';
+import type { BlockModel } from '@blocksuite/store';
+
+import { focusTextModel } from '../dom.js';
+import { beforeConvert } from './utils.js';
+
+export function toDivider(
+  std: BlockStdScope,
+  model: BlockModel,
+  prefix: string
+) {
+  const { store: doc } = std;
+  if (
+    matchModels(model, [DividerBlockModel]) ||
+    (matchModels(model, [ParagraphBlockModel]) && model.props.type === 'quote')
+  ) {
+    return;
+  }
+
+  const parent = doc.getParent(model);
+  if (!parent) return;
+
+  const index = parent.children.indexOf(model);
+  beforeConvert(std, model, prefix.length);
+  const blockProps = {
+    children: model.children,
+  };
+  doc.addBlock('affine:divider', blockProps, parent, index);
+
+  const nextBlock = parent.children[index + 1];
+  let id = nextBlock?.id;
+  if (!id) {
+    id = doc.addBlock('affine:paragraph', {}, parent);
+  }
+  focusTextModel(std, id);
+  return id;
+}

blocksuite/affine/rich-text/src/markdown/index.ts

@@ -0,0 +1 @@
+export { markdownInput } from './markdown-input.js';

blocksuite/affine/rich-text/src/markdown/list.ts

@@ -0,0 +1,54 @@
+import {
+  type ListProps,
+  type ListType,
+  ParagraphBlockModel,
+} from '@blocksuite/affine-model';
+import { matchModels, toNumberedList } from '@blocksuite/affine-shared/utils';
+import type { BlockStdScope } from '@blocksuite/std';
+import type { BlockModel } from '@blocksuite/store';
+
+import { focusTextModel } from '../dom.js';
+import { beforeConvert } from './utils.js';
+
+export function toList(
+  std: BlockStdScope,
+  model: BlockModel,
+  listType: ListType,
+  prefix: string,
+  otherProperties?: Partial<ListProps>
+) {
+  if (!matchModels(model, [ParagraphBlockModel])) {
+    return;
+  }
+  const { store: doc } = std;
+  const parent = doc.getParent(model);
+  if (!parent) return;
+
+  beforeConvert(std, model, prefix.length);
+
+  if (listType !== 'numbered') {
+    const index = parent.children.indexOf(model);
+    const blockProps = {
+      type: listType,
+      text: model.text?.clone(),
+      children: model.children,
+      ...otherProperties,
+    };
+    doc.deleteBlock(model, {
+      deleteChildren: false,
+    });
+
+    const id = doc.addBlock('affine:list', blockProps, parent, index);
+    focusTextModel(std, id);
+    return id;
+  }
+
+  let order = parseInt(prefix.slice(0, -1));
+  if (!Number.isInteger(order)) order = 1;
+
+  const id = toNumberedList(std, model, order);
+  if (!id) return;
+
+  focusTextModel(std, id);
+  return id;
+}

blocksuite/affine/rich-text/src/markdown/markdown-input.ts

@@ -0,0 +1,98 @@
+import {
+  CalloutBlockModel,
+  CodeBlockModel,
+  ParagraphBlockModel,
+} from '@blocksuite/affine-model';
+import {
+  isHorizontalRuleMarkdown,
+  isMarkdownPrefix,
+  matchModels,
+} from '@blocksuite/affine-shared/utils';
+import { type BlockStdScope, TextSelection } from '@blocksuite/std';
+
+import { getInlineEditorByModel } from '../dom.js';
+import { toDivider } from './divider.js';
+import { toList } from './list.js';
+import { toParagraph } from './paragraph.js';
+import { toCode } from './to-code.js';
+import { getPrefixText } from './utils.js';
+
+export function markdownInput(
+  std: BlockStdScope,
+  id?: string
+): string | undefined {
+  if (!id) {
+    const selection = std.selection;
+    const text = selection.find(TextSelection);
+    id = text?.from.blockId;
+  }
+  if (!id) return;
+  const model = std.store.getBlock(id)?.model;
+  if (!model) return;
+  const inline = getInlineEditorByModel(std, model);
+  if (!inline) return;
+  const range = inline.getInlineRange();
+  if (!range) return;
+
+  const prefixText = getPrefixText(inline);
+  if (!isMarkdownPrefix(prefixText)) return;
+
+  const isParagraph = matchModels(model, [ParagraphBlockModel]);
+  const isHeading = isParagraph && model.props.type.startsWith('h');
+  const isParagraphQuoteBlock = isParagraph && model.props.type === 'quote';
+  const isCodeBlock = matchModels(model, [CodeBlockModel]);
+  if (
+    isHeading ||
+    isParagraphQuoteBlock ||
+    isCodeBlock ||
+    matchModels(model.parent, [CalloutBlockModel])
+  )
+    return;
+
+  const lineInfo = inline.getLine(range.index);
+  if (!lineInfo) return;
+
+  const { lineIndex, rangeIndexRelatedToLine } = lineInfo;
+  if (lineIndex !== 0 || rangeIndexRelatedToLine > prefixText.length) return;
+
+  // try to add code block
+  const codeMatch = prefixText.match(/^```([a-zA-Z0-9]*)$/g);
+  if (codeMatch) {
+    return toCode(std, model, prefixText, codeMatch[0].slice(3));
+  }
+
+  if (isHorizontalRuleMarkdown(prefixText.trim())) {
+    return toDivider(std, model, prefixText);
+  }
+
+  switch (prefixText.trim()) {
+    case '[]':
+    case '[ ]':
+      return toList(std, model, 'todo', prefixText, {
+        checked: false,
+      });
+    case '[x]':
+      return toList(std, model, 'todo', prefixText, {
+        checked: true,
+      });
+    case '-':
+    case '*':
+      return toList(std, model, 'bulleted', prefixText);
+    case '#':
+      return toParagraph(std, model, 'h1', prefixText);
+    case '##':
+      return toParagraph(std, model, 'h2', prefixText);
+    case '###':
+      return toParagraph(std, model, 'h3', prefixText);
+    case '####':
+      return toParagraph(std, model, 'h4', prefixText);
+    case '#####':
+      return toParagraph(std, model, 'h5', prefixText);
+    case '######':
+      return toParagraph(std, model, 'h6', prefixText);
+    case '>':
+      return toParagraph(std, model, 'quote', prefixText);
+    default:
+      return toList(std, model, 'numbered', prefixText);
+  }
+}

blocksuite/affine/rich-text/src/markdown/paragraph.ts

@@ -0,0 +1,49 @@
+import {
+  ParagraphBlockModel,
+  type ParagraphType,
+} from '@blocksuite/affine-model';
+import { matchModels } from '@blocksuite/affine-shared/utils';
+import type { BlockStdScope } from '@blocksuite/std';
+import type { BlockModel } from '@blocksuite/store';
+
+import { focusTextModel } from '../dom.js';
+import { beforeConvert } from './utils.js';
+
+export function toParagraph(
+  std: BlockStdScope,
+  model: BlockModel,
+  type: ParagraphType,
+  prefix: string
+) {
+  const { store: doc } = std;
+  if (!matchModels(model, [ParagraphBlockModel])) {
+    const parent = doc.getParent(model);
+    if (!parent) return;
+
+    const index = parent.children.indexOf(model);
+
+    beforeConvert(std, model, prefix.length);
+
+    const blockProps = {
+      type: type,
+      text: model.text?.clone(),
+      children: model.children,
+    };
+    doc.deleteBlock(model, { deleteChildren: false });
+    const id = doc.addBlock('affine:paragraph', blockProps, parent, index);
+
+    focusTextModel(std, id);
+    return id;
+  }
+
+  if (matchModels(model, [ParagraphBlockModel]) && model.props.type !== type) {
+    beforeConvert(std, model, prefix.length);
+
+    doc.updateBlock(model, { type });
+
+    focusTextModel(std, model.id);
+  }
+
+  // If the model is already a paragraph with the same type, do nothing
+  return model.id;
+}