feat(core): block diff ui

.devcontainer/docker-compose.yml

@@ -25,7 +25,7 @@ services:
     image: redis
 
   indexer:
-    image: manticoresearch/manticore:${MANTICORE_VERSION:-10.1.0}
+    image: manticoresearch/manticore:${MANTICORE_VERSION:-9.3.2}
     ulimits:
       nproc: 65535
       nofile:

.docker/dev/.env.example

@@ -12,4 +12,4 @@ DB_DATABASE_NAME=affine
 # ELASTIC_PLATFORM=linux/arm64
 
 # manticoresearch
-MANTICORE_VERSION=10.1.0
+MANTICORE_VERSION=9.3.2

.docker/dev/README.md

@@ -15,7 +15,13 @@ yarn affine cert --install
 
 ```bash
 # certificates will be located at `./.docker/dev/certs/${domain}`
-yarn affine cert --domain affine.localhost
+yarn affine cert --domain dev.affine.fail
 ```
 
-### 3. Enable nginx service in compose.yml
+### 3. Enable dns and nginx service in compose.yml
+
+### 4. Add custom dns server
+
+```bash
+echo "nameserver 127.0.0.1" | sudo tee /etc/resolver/dev.affine.fail
+```

.docker/dev/compose.yml.example

@@ -26,7 +26,7 @@ services:
 
   # https://manual.manticoresearch.com/Starting_the_server/Docker
   manticoresearch:
-    image: manticoresearch/manticore:${MANTICORE_VERSION:-10.1.0}
+    image: manticoresearch/manticore:${MANTICORE_VERSION:-9.3.2}
     ports:
       - 9308:9308
     ulimits:
@@ -73,6 +73,17 @@ services:
   #     timeout: 10s
   #     retries: 120
 
+  # dns:
+  #   image: strm/dnsmasq
+  #   volumes:
+  #     - ./dnsmasq.conf:/etc/dnsmasq.d/local.conf
+  #   ports:
+  #     - "53:53/udp"
+  #   cap_add:
+  #     - NET_ADMIN
+  #   depends_on:
+  #     - nginx
+
   # nginx:
   #   image: nginx:alpine
   #   volumes:

.docker/dev/dnsmasq.conf

@@ -0,0 +1,2 @@
+log-queries
+address=/dev.affine.fail/127.0.0.1

.docker/selfhost/schema.json

@@ -597,6 +597,11 @@
           "type": "string",
           "description": "Allowed version range of the app that allowed to access the server. Requires 'client/versionControl.enabled' to be true to take effect.\n@default \">=0.20.0\"",
           "default": ">=0.20.0"
+        },
+        "allowGuestDemoWorkspace": {
+          "type": "boolean",
+          "description": "Allow guests to access demo workspace.\n@default true",
+          "default": true
         }
       }
     },

.github/actions/prepare-release/action.yml

@@ -21,7 +21,7 @@ runs:
         if [ "${{ github.ref_type }}" == "tag" ]; then
           APP_VERSION=$(echo "${{ github.ref_name }}" | sed 's/^v//')
         else
-          APP_VERSION=$(date '+%Y.%-m.%-d-canary.%-H%M')
+          APP_VERSION=$(date '+%Y.%-m.%-d-canary.%-H%-M')
         fi
         if [[ "$APP_VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
           BUILD_TYPE=stable

.github/actions/setup-version/action.yml

@@ -4,15 +4,9 @@ inputs:
   app-version:
     description: 'App Version'
     required: true
-  ios-app-version:
-    description: 'iOS App Store Version (Optional, use App version if empty)'
-    required: false
-    type: string
 runs:
   using: 'composite'
   steps:
     - name: 'Write Version'
       shell: bash
-      env:
-        IOS_APP_VERSION: ${{ inputs.ios-app-version }}
       run: ./scripts/set-version.sh ${{ inputs.app-version }}

.github/deployment/node/Dockerfile

@@ -7,10 +7,7 @@ COPY ./packages/frontend/apps/mobile/dist /app/static/mobile
 WORKDIR /app
 
 RUN apt-get update && \
-  apt-get install -y --no-install-recommends openssl libjemalloc2 && \
+  apt-get install -y --no-install-recommends openssl && \
   rm -rf /var/lib/apt/lists/*
 
-# Enable jemalloc by preloading the library
-ENV LD_PRELOAD=libjemalloc.so.2
-
 CMD ["node", "./dist/main.js"]

.github/workflows/build-test.yml

@@ -972,8 +972,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        shardIndex: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-        shardTotal: [10]
+        shardIndex: [1, 2, 3, 4, 5, 6, 7, 8]
+        shardTotal: [8]
     needs:
       - build-server-native
     services:
@@ -1064,36 +1064,24 @@ jobs:
       fail-fast: false
       matrix:
         tests:
-          - name: 'Cloud E2E Test 1/10'
+          - name: 'Cloud E2E Test 1/6'
             shard: 1
-            script: yarn affine @affine-test/affine-cloud e2e --forbid-only --shard=1/10
-          - name: 'Cloud E2E Test 2/10'
+            script: yarn affine @affine-test/affine-cloud e2e --forbid-only --shard=1/6
+          - name: 'Cloud E2E Test 2/6'
             shard: 2
-            script: yarn affine @affine-test/affine-cloud e2e --forbid-only --shard=2/10
-          - name: 'Cloud E2E Test 3/10'
+            script: yarn affine @affine-test/affine-cloud e2e --forbid-only --shard=2/6
+          - name: 'Cloud E2E Test 3/6'
             shard: 3
-            script: yarn affine @affine-test/affine-cloud e2e --forbid-only --shard=3/10
-          - name: 'Cloud E2E Test 4/10'
+            script: yarn affine @affine-test/affine-cloud e2e --forbid-only --shard=3/6
+          - name: 'Cloud E2E Test 4/6'
             shard: 4
-            script: yarn affine @affine-test/affine-cloud e2e --forbid-only --shard=4/10
-          - name: 'Cloud E2E Test 5/10'
+            script: yarn affine @affine-test/affine-cloud e2e --forbid-only --shard=4/6
+          - name: 'Cloud E2E Test 5/6'
             shard: 5
-            script: yarn affine @affine-test/affine-cloud e2e --forbid-only --shard=5/10
-          - name: 'Cloud E2E Test 6/10'
+            script: yarn affine @affine-test/affine-cloud e2e --forbid-only --shard=5/6
+          - name: 'Cloud E2E Test 6/6'
             shard: 6
-            script: yarn affine @affine-test/affine-cloud e2e --forbid-only --shard=6/10
-          - name: 'Cloud E2E Test 7/10'
-            shard: 7
-            script: yarn affine @affine-test/affine-cloud e2e --forbid-only --shard=7/10
-          - name: 'Cloud E2E Test 8/10'
-            shard: 8
-            script: yarn affine @affine-test/affine-cloud e2e --forbid-only --shard=8/10
-          - name: 'Cloud E2E Test 9/10'
-            shard: 9
-            script: yarn affine @affine-test/affine-cloud e2e --forbid-only --shard=9/10
-          - name: 'Cloud E2E Test 10/10'
-            shard: 10
-            script: yarn affine @affine-test/affine-cloud e2e --forbid-only --shard=10/10
+            script: yarn affine @affine-test/affine-cloud e2e --forbid-only --shard=6/6
           - name: 'Cloud Desktop E2E Test'
             shard: desktop
             script: |

.github/workflows/copilot-test.yml

@@ -109,8 +109,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        shardIndex: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
-        shardTotal: [10]
+        shardIndex: [1, 2, 3, 4, 5, 6, 7, 8]
+        shardTotal: [8]
     needs:
       - build-server-native
     services:

.github/workflows/release-desktop.yml

@@ -465,7 +465,7 @@ jobs:
           name: ${{ env.RELEASE_VERSION }}
           draft: ${{ inputs.build-type == 'stable' }}
           prerelease: ${{ inputs.build-type != 'stable' }}
-          tag_name: v${{ env.RELEASE_VERSION}}
+          tag_name: ${{ env.RELEASE_VERSION}}
           files: |
             ./release/*
             ./release/.env.example

.github/workflows/release-mobile.yml

@@ -12,9 +12,6 @@ on:
       build-type:
         type: string
         required: true
-      ios-app-version:
-        type: string
-        required: false
 
 env:
   BUILD_TYPE: ${{ inputs.build-type }}
@@ -81,7 +78,7 @@ jobs:
           path: packages/frontend/apps/android/dist
 
   ios:
-    runs-on: 'macos-15'
+    runs-on: ${{ github.ref_name == 'canary' && 'macos-latest' || 'blaze/macos-14' }}
     needs:
       - build-ios-web
     steps:
@@ -90,7 +87,6 @@ jobs:
         uses: ./.github/actions/setup-version
         with:
           app-version: ${{ inputs.app-version }}
-          ios-app-version: ${{ inputs.ios-app-version }}
       - name: 'Update Code Sign Identity'
         shell: bash
         run: ./packages/frontend/apps/ios/update_code_sign_identity.sh
@@ -110,7 +106,7 @@ jobs:
           enableScripts: false
       - uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: 16.4
+          xcode-version: 16.2
       - name: Install Swiftformat
         run: brew install swiftformat
       - name: Cap sync
@@ -128,6 +124,7 @@ jobs:
           package: 'affine_mobile_native'
           no-build: 'true'
       - name: Testflight
+        if: ${{ env.BUILD_TYPE != 'stable' }}
         working-directory: packages/frontend/apps/ios/App
         run: |
           echo -n "${{ env.BUILD_PROVISION_PROFILE }}" | base64 --decode -o $PP_PATH

.github/workflows/release.yml

@@ -21,10 +21,6 @@ on:
         required: true
         type: boolean
         default: false
-      ios-app-version:
-        description: 'iOS App Store Version (Optional, use tag version if empty)'
-        required: false
-        type: string
 
 permissions:
   contents: write
@@ -34,7 +30,6 @@ permissions:
   packages: write
   security-events: write
   attestations: write
-  issues: write
 
 jobs:
   prepare:
@@ -75,7 +70,6 @@ jobs:
         with:
           secret: ${{ secrets.GITHUB_TOKEN }}
           approvers: forehalo,fengmk2
-          minimum-approvals: 1
           fail-on-denial: true
           issue-title: Please confirm to release docker image
           issue-body: |
@@ -123,4 +117,3 @@ jobs:
       build-type: ${{ needs.prepare.outputs.BUILD_TYPE }}
       app-version: ${{ needs.prepare.outputs.APP_VERSION }}
       git-short-hash: ${{ needs.prepare.outputs.GIT_SHORT_HASH }}
-      ios-app-version: ${{ inputs.ios-app-version }}

blocksuite/affine/all/package.json

@@ -48,7 +48,6 @@
     "@blocksuite/affine-gfx-template": "workspace:*",
     "@blocksuite/affine-gfx-text": "workspace:*",
     "@blocksuite/affine-gfx-turbo-renderer": "workspace:*",
-    "@blocksuite/affine-inline-comment": "workspace:*",
     "@blocksuite/affine-inline-footnote": "workspace:*",
     "@blocksuite/affine-inline-latex": "workspace:*",
     "@blocksuite/affine-inline-link": "workspace:*",
@@ -174,7 +173,6 @@
     "./inlines/footnote": "./src/inlines/footnote/index.ts",
     "./inlines/footnote/view": "./src/inlines/footnote/view.ts",
     "./inlines/footnote/store": "./src/inlines/footnote/store.ts",
-    "./inlines/comment": "./src/inlines/comment/index.ts",
     "./inlines/latex": "./src/inlines/latex/index.ts",
     "./inlines/latex/store": "./src/inlines/latex/store.ts",
     "./inlines/latex/view": "./src/inlines/latex/view.ts",
@@ -266,7 +264,6 @@
     "./components/toggle-button": "./src/components/toggle-button.ts",
     "./components/toggle-switch": "./src/components/toggle-switch.ts",
     "./components/toolbar": "./src/components/toolbar.ts",
-    "./components/tooltip": "./src/components/tooltip.ts",
     "./components/view-dropdown-menu": "./src/components/view-dropdown-menu.ts",
     "./components/tooltip-content-with-shortcut": "./src/components/tooltip-content-with-shortcut.ts",
     "./components/resource": "./src/components/resource.ts",
@@ -286,7 +283,6 @@
     "./sync": "./src/sync/index.ts",
     "./extensions/store": "./src/extensions/store.ts",
     "./extensions/view": "./src/extensions/view.ts",
-    "./foundation/clipboard": "./src/foundation/clipboard.ts",
     "./foundation/store": "./src/foundation/store.ts",
     "./foundation/view": "./src/foundation/view.ts"
   },

blocksuite/affine/all/src/components/tooltip.ts

@@ -1 +0,0 @@
-export * from '@blocksuite/affine-components/tooltip';

blocksuite/affine/all/src/extensions/view.ts

@@ -33,7 +33,6 @@ import { PointerViewExtension } from '@blocksuite/affine-gfx-pointer/view';
 import { ShapeViewExtension } from '@blocksuite/affine-gfx-shape/view';
 import { TemplateViewExtension } from '@blocksuite/affine-gfx-template/view';
 import { TextViewExtension } from '@blocksuite/affine-gfx-text/view';
-import { InlineCommentViewExtension } from '@blocksuite/affine-inline-comment/view';
 import { FootnoteViewExtension } from '@blocksuite/affine-inline-footnote/view';
 import { LatexViewExtension as InlineLatexViewExtension } from '@blocksuite/affine-inline-latex/view';
 import { LinkViewExtension } from '@blocksuite/affine-inline-link/view';
@@ -96,7 +95,6 @@ export function getInternalViewExtensions() {
     RootViewExtension,
 
     // Inline
-    InlineCommentViewExtension,
     FootnoteViewExtension,
     LinkViewExtension,
     ReferenceViewExtension,

blocksuite/affine/all/src/foundation/clipboard.ts

@@ -1 +0,0 @@
-export * from '@blocksuite/affine-foundation/clipboard';

blocksuite/affine/all/src/inlines/comment/index.ts

@@ -1 +0,0 @@
-export * from '@blocksuite/affine-inline-comment';

blocksuite/affine/all/tsconfig.json

@@ -45,7 +45,6 @@
     { "path": "../gfx/template" },
     { "path": "../gfx/text" },
     { "path": "../gfx/turbo-renderer" },
-    { "path": "../inlines/comment" },
     { "path": "../inlines/footnote" },
     { "path": "../inlines/latex" },
     { "path": "../inlines/link" },

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

@@ -17,7 +17,6 @@ import {
   AttachmentBlockStyles,
 } from '@blocksuite/affine-model';
 import {
-  BlockElementCommentManager,
   CitationProvider,
   DocModeProvider,
   FileSizeLimitProvider,
@@ -93,14 +92,6 @@ export class AttachmentBlockComponent extends CaptionedBlockComponent<Attachment
     return this.citationService.isCitationModel(this.model);
   }
 
-  get isCommentHighlighted() {
-    return (
-      this.std
-        .getOptional(BlockElementCommentManager)
-        ?.isBlockCommentHighlighted(this.model) ?? false
-    );
-  }
-
   convertTo = () => {
     return this.std
       .get(AttachmentEmbedProvider)
@@ -508,7 +499,6 @@ export class AttachmentBlockComponent extends CaptionedBlockComponent<Attachment
         class=${classMap({
           'affine-attachment-container': true,
           focused: this.selected$.value,
-          'comment-highlighted': this.isCommentHighlighted,
         })}
         style=${this.containerStyleMap}
       >

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

@@ -15,10 +15,6 @@ export const styles = css`
     }
   }
 
-  .affine-attachment-container.comment-highlighted {
-    outline: 2px solid ${unsafeCSSVarV2('block/comment/highlightUnderline')};
-  }
-
   .affine-attachment-card {
     display: flex;
     gap: 12px;

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 {
-  BlockElementCommentManager,
   CitationProvider,
   DocModeProvider,
   LinkPreviewServiceIdentifier,
@@ -129,14 +128,6 @@ export class BookmarkBlockComponent extends CaptionedBlockComponent<BookmarkBloc
     return this.std.get(ImageProxyService);
   }
 
-  get isCommentHighlighted() {
-    return (
-      this.std
-        .getOptional(BlockElementCommentManager)
-        ?.isBlockCommentHighlighted(this.model) ?? false
-    );
-  }
-
   handleClick = (event: MouseEvent) => {
     event.stopPropagation();
 

blocksuite/affine/blocks/bookmark/src/components/bookmark-card.ts

@@ -45,7 +45,6 @@ export class BookmarkCard extends SignalWatcher(
       [style]: true,
       selected: this.bookmark.selected$.value,
       edgeless: isGfxBlockComponent(this.bookmark),
-      'comment-highlighted': this.bookmark.isCommentHighlighted,
     });
 
     const domainName = url.match(

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

@@ -1,4 +1,4 @@
-import { unsafeCSSVar, unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
+import { unsafeCSSVar } from '@blocksuite/affine-shared/theme';
 import { baseTheme } from '@toeverything/theme';
 import { css, unsafeCSS } from 'lit';
 
@@ -17,9 +17,9 @@ export const styles = css`
     width: 100%;
 
     border-radius: 8px;
-    border: 1px solid ${unsafeCSSVarV2('layer/background/tertiary')};
+    border: 1px solid var(--affine-background-tertiary-color);
 
-    background: ${unsafeCSSVarV2('layer/background/primary')};
+    background: var(--affine-background-primary-color);
     user-select: none;
   }
 
@@ -158,10 +158,6 @@ export const styles = css`
     border-radius: 4px;
   }
 
-  .affine-bookmark-card.comment-highlighted {
-    outline: 2px solid ${unsafeCSSVarV2('block/comment/highlightUnderline')};
-  }
-
   .affine-bookmark-card.loading {
     .affine-bookmark-content-title-text {
       color: var(--affine-placeholder-color);

blocksuite/affine/blocks/code/package.json

@@ -13,7 +13,6 @@
     "@blocksuite/affine-components": "workspace:*",
     "@blocksuite/affine-ext-loader": "workspace:*",
     "@blocksuite/affine-gfx-turbo-renderer": "workspace:*",
-    "@blocksuite/affine-inline-comment": "workspace:*",
     "@blocksuite/affine-inline-latex": "workspace:*",
     "@blocksuite/affine-inline-link": "workspace:*",
     "@blocksuite/affine-inline-preset": "workspace:*",

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

@@ -1,4 +1,3 @@
-import { CommentInlineSpecExtension } from '@blocksuite/affine-inline-comment';
 import { LatexInlineSpecExtension } from '@blocksuite/affine-inline-latex';
 import { LinkInlineSpecExtension } from '@blocksuite/affine-inline-link';
 import {
@@ -21,9 +20,7 @@ import { z } from 'zod';
 export const CodeBlockUnitSpecExtension =
   InlineSpecExtension<AffineTextAttributes>({
     name: 'code-block-unit',
-    schema: z.object({
-      'code-block-uint': z.undefined(),
-    }),
+    schema: z.undefined(),
     match: () => true,
     renderer: ({ delta }) => {
       return html`<affine-code-unit .delta=${delta}></affine-code-unit>`;
@@ -45,6 +42,5 @@ export const CodeBlockInlineManagerExtension =
       LatexInlineSpecExtension.identifier,
       LinkInlineSpecExtension.identifier,
       CodeBlockUnitSpecExtension.identifier,
-      CommentInlineSpecExtension.identifier,
     ],
   });

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

@@ -19,12 +19,8 @@ import {
 export class CodeBlockHighlighter extends LifeCycleWatcher {
   static override key = 'code-block-highlighter';
 
-  // Singleton highlighter instance
-  private static _sharedHighlighter: HighlighterCore | null = null;
-  private static _highlighterPromise: Promise<HighlighterCore> | null = null;
-  private static _refCount = 0;
-
   private _darkThemeKey: string | undefined;
+
   private _lightThemeKey: string | undefined;
 
   highlighter$: Signal<HighlighterCore | null> = signal(null);
@@ -39,13 +35,6 @@ export class CodeBlockHighlighter extends LifeCycleWatcher {
   private readonly _loadTheme = async (
     highlighter: HighlighterCore
   ): Promise<void> => {
-    // It is possible that by the time the highlighter is ready all instances
-    // have already been unmounted. In that case there is no need to load
-    // themes or update state.
-    if (CodeBlockHighlighter._refCount === 0) {
-      return;
-    }
-
     const config = this.std.getOptional(CodeBlockConfigExtension.identifier);
     const darkTheme = config?.theme?.dark ?? CODE_BLOCK_DEFAULT_DARK_THEME;
     const lightTheme = config?.theme?.light ?? CODE_BLOCK_DEFAULT_LIGHT_THEME;
@@ -55,58 +44,18 @@ export class CodeBlockHighlighter extends LifeCycleWatcher {
     this.highlighter$.value = highlighter;
   };
 
-  private static async _getOrCreateHighlighter(): Promise<HighlighterCore> {
-    if (CodeBlockHighlighter._sharedHighlighter) {
-      return CodeBlockHighlighter._sharedHighlighter;
-    }
-
-    if (!CodeBlockHighlighter._highlighterPromise) {
-      CodeBlockHighlighter._highlighterPromise = createHighlighterCore({
-        engine: createOnigurumaEngine(() => getWasm),
-      }).then(highlighter => {
-        CodeBlockHighlighter._sharedHighlighter = highlighter;
-        return highlighter;
-      });
-    }
-
-    return CodeBlockHighlighter._highlighterPromise;
-  }
-
   override mounted(): void {
     super.mounted();
 
-    CodeBlockHighlighter._refCount++;
-
-    CodeBlockHighlighter._getOrCreateHighlighter()
+    createHighlighterCore({
+      engine: createOnigurumaEngine(() => getWasm),
+    })
       .then(this._loadTheme)
       .catch(console.error);
   }
 
   override unmounted(): void {
-    CodeBlockHighlighter._refCount--;
-
-    // Dispose the shared highlighter **after** any in-flight creation finishes.
-    if (CodeBlockHighlighter._refCount !== 0) {
-      return;
-    }
-
-    const doDispose = (highlighter: HighlighterCore | null) => {
-      if (highlighter) {
-        highlighter.dispose();
-      }
-      CodeBlockHighlighter._sharedHighlighter = null;
-      CodeBlockHighlighter._highlighterPromise = null;
-    };
-
-    if (CodeBlockHighlighter._sharedHighlighter) {
-      // Highlighter already created – dispose immediately.
-      doDispose(CodeBlockHighlighter._sharedHighlighter);
-    } else if (CodeBlockHighlighter._highlighterPromise) {
-      // Highlighter still being created – wait for it, then dispose.
-      CodeBlockHighlighter._highlighterPromise
-        .then(doDispose)
-        .catch(console.error);
-    }
+    this.highlighter$.value?.dispose();
   }
 }
 

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

@@ -6,7 +6,6 @@ import {
   EDGELESS_TOP_CONTENTEDITABLE_SELECTOR,
 } from '@blocksuite/affine-shared/consts';
 import {
-  BlockElementCommentManager,
   DocModeProvider,
   NotificationProvider,
 } from '@blocksuite/affine-shared/services';
@@ -391,14 +390,6 @@ export class CodeBlockComponent extends CaptionedBlockComponent<CodeBlockModel>
       });
   }
 
-  get isCommentHighlighted() {
-    return (
-      this.std
-        .getOptional(BlockElementCommentManager)
-        ?.isBlockCommentHighlighted(this.model) ?? false
-    );
-  }
-
   override async getUpdateComplete() {
     const result = await super.getUpdateComplete();
     await this._richTextElement?.updateComplete;
@@ -422,7 +413,6 @@ export class CodeBlockComponent extends CaptionedBlockComponent<CodeBlockModel>
       <div
         class=${classMap({
           'affine-code-block-container': true,
-          'highlight-comment': this.isCommentHighlighted,
           mobile: IS_MOBILE,
           wrap: this.model.props.wrap,
           'disable-line-numbers': !showLineNumbers,

blocksuite/affine/blocks/code/src/code-toolbar/config.ts

@@ -7,10 +7,9 @@ import {
   WrapIcon,
 } from '@blocksuite/affine-components/icons';
 import type { MenuItemGroup } from '@blocksuite/affine-components/toolbar';
-import { CommentProviderIdentifier } from '@blocksuite/affine-shared/services';
 import { isInsidePageEditor } from '@blocksuite/affine-shared/utils';
 import { noop, sleep } from '@blocksuite/global/utils';
-import { CommentIcon, NumberedListIcon } from '@blocksuite/icons/lit';
+import { NumberedListIcon } from '@blocksuite/icons/lit';
 import { BlockSelection } from '@blocksuite/std';
 import { html } from 'lit';
 import { ifDefined } from 'lit/directives/if-defined.js';
@@ -114,47 +113,6 @@ export const PRIMARY_GROUPS: MenuItemGroup<CodeBlockToolbarContext>[] = [
           };
         },
       },
-      {
-        type: 'comment',
-        label: 'Comment',
-        tooltip: 'Comment',
-        icon: CommentIcon({
-          width: '20',
-          height: '20',
-        }),
-        when: ({ std }) => !!std.getOptional(CommentProviderIdentifier),
-        generate: ({ blockComponent }) => {
-          return {
-            action: () => {
-              const commentProvider = blockComponent.std.getOptional(
-                CommentProviderIdentifier
-              );
-              if (!commentProvider) return;
-
-              commentProvider.addComment([
-                new BlockSelection({
-                  blockId: blockComponent.model.id,
-                }),
-              ]);
-            },
-            render: item =>
-              html`<editor-icon-button
-                class="code-toolbar-button comment"
-                aria-label=${ifDefined(item.label)}
-                .tooltip=${item.label}
-                .tooltipOffset=${4}
-                .iconSize=${'16px'}
-                .iconContainerPadding=${4}
-                @click=${(e: MouseEvent) => {
-                  e.stopPropagation();
-                  item.action();
-                }}
-              >
-                ${item.icon}
-              </editor-icon-button>`,
-          };
-        },
-      },
     ],
   },
 ];

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

@@ -2,9 +2,7 @@ export * from './adapters';
 export * from './clipboard';
 export * from './code-block';
 export * from './code-block-config';
-export * from './code-block-service';
 export * from './code-preview-extension';
 export * from './code-toolbar';
-export * from './highlight/const';
 export * from './turbo/code-layout-handler';
 export * from './turbo/code-painter.worker';

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

@@ -1,5 +1,4 @@
 import { scrollbarStyle } from '@blocksuite/affine-shared/styles';
-import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
 import { css } from 'lit';
 
 export const codeBlockStyles = css`
@@ -21,10 +20,6 @@ export const codeBlockStyles = css`
     padding: 12px;
   }
 
-  .affine-code-block-container.highlight-comment {
-    outline: 2px solid ${unsafeCSSVarV2('block/comment/highlightUnderline')};
-  }
-
   ${scrollbarStyle('.affine-code-block-container rich-text')}
 
   .affine-code-block-container .inline-editor {

blocksuite/affine/blocks/code/tsconfig.json

@@ -10,7 +10,6 @@
     { "path": "../../components" },
     { "path": "../../ext-loader" },
     { "path": "../../gfx/turbo-renderer" },
-    { "path": "../../inlines/comment" },
     { "path": "../../inlines/latex" },
     { "path": "../../inlines/link" },
     { "path": "../../inlines/preset" },

blocksuite/affine/blocks/data-view/src/data-view-block.ts

@@ -40,9 +40,9 @@ import { RANGE_SYNC_EXCLUDE_ATTR } from '@blocksuite/std/inline';
 import { Slice } from '@blocksuite/store';
 import { computed, signal } from '@preact/signals-core';
 import { css, nothing, unsafeCSS } from 'lit';
-import { repeat } from 'lit/directives/repeat.js';
 import { html } from 'lit/static-html.js';
 
+import { repeat } from 'lit/directives/repeat.js';
 import { BlockQueryDataSource } from './data-source.js';
 import type { DataViewBlockModel } from './data-view-model.js';
 
@@ -312,7 +312,8 @@ export class DataViewBlockComponent extends CaptionedBlockComponent<DataViewBloc
 
     return html`
       <div contenteditable="false" style="position: relative">
-        ${this.dataViewRootLogic.render()} ${widgets}
+        ${this.dataViewRootLogic.render()}
+        ${widgets}
       </div>
     `;
   }

blocksuite/affine/blocks/database/src/components/title/index.ts

@@ -1,4 +1,3 @@
-import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
 import { stopPropagation } from '@blocksuite/affine-shared/utils';
 import type { DataViewUILogicBase } from '@blocksuite/data-view';
 import { SignalWatcher, WithDisposable } from '@blocksuite/global/lit';
@@ -73,12 +72,6 @@ export class DatabaseTitle extends SignalWatcher(
     .affine-database-title [data-title-focus='true']::before {
       color: var(--affine-placeholder-color);
     }
-
-    .affine-database-title.comment-highlighted {
-      border-bottom: 2px solid
-        ${unsafeCSSVarV2('block/comment/highlightUnderline')};
-      background-color: ${unsafeCSSVarV2('block/comment/highlightActive')};
-    }
   `;
 
   private readonly compositionEnd = () => {
@@ -141,7 +134,6 @@ export class DatabaseTitle extends SignalWatcher(
     const classList = classMap({
       'affine-database-title': true,
       ellipsis: !this.isFocus$.value,
-      'comment-highlighted': this.database?.isCommentHighlighted ?? false,
     });
     const untitledStyle = styleMap({
       height: isEmpty ? 'auto' : 0,

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

@@ -10,8 +10,6 @@ import { toast } from '@blocksuite/affine-components/toast';
 import type { DatabaseBlockModel } from '@blocksuite/affine-model';
 import { EDGELESS_TOP_CONTENTEDITABLE_SELECTOR } from '@blocksuite/affine-shared/consts';
 import {
-  BlockElementCommentManager,
-  CommentProviderIdentifier,
   DocModeProvider,
   NotificationProvider,
   type TelemetryEventMap,
@@ -36,19 +34,18 @@ import {
 import { widgetPresets } from '@blocksuite/data-view/widget-presets';
 import { Rect } from '@blocksuite/global/gfx';
 import {
-  CommentIcon,
   CopyIcon,
   DeleteIcon,
   MoreHorizontalIcon,
 } from '@blocksuite/icons/lit';
-import { type BlockComponent, BlockSelection } from '@blocksuite/std';
+import { type BlockComponent } from '@blocksuite/std';
 import { RANGE_SYNC_EXCLUDE_ATTR } from '@blocksuite/std/inline';
 import { Slice } from '@blocksuite/store';
 import { autoUpdate } from '@floating-ui/dom';
 import { computed, signal } from '@preact/signals-core';
 import { html, nothing } from 'lit';
-import { repeat } from 'lit/directives/repeat.js';
 
+import { repeat } from 'lit/directives/repeat.js';
 import { popSideDetail } from './components/layout.js';
 import { DatabaseConfigExtension } from './config.js';
 import { EditorHostKey } from './context/host-context.js';
@@ -86,18 +83,6 @@ export class DatabaseBlockComponent extends CaptionedBlockComponent<DatabaseBloc
             );
           },
         }),
-        menu.action({
-          prefix: CommentIcon(),
-          name: 'Comment',
-          hide: () => !this.std.getOptional(CommentProviderIdentifier),
-          select: () => {
-            this.std.getOptional(CommentProviderIdentifier)?.addComment([
-              new BlockSelection({
-                blockId: this.blockId,
-              }),
-            ]);
-          },
-        }),
         menu.action({
           prefix: CopyIcon(),
           name: 'Copy',
@@ -313,14 +298,6 @@ export class DatabaseBlockComponent extends CaptionedBlockComponent<DatabaseBloc
     };
   }
 
-  get isCommentHighlighted() {
-    return (
-      this.std
-        .getOptional(BlockElementCommentManager)
-        ?.isBlockCommentHighlighted(this.model) ?? false
-    );
-  }
-
   override get topContenteditableElement() {
     if (this.std.get(DocModeProvider).getEditorMode() === 'edgeless') {
       return this.closest<BlockComponent>(

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

@@ -70,7 +70,7 @@ function toggleStyle(
         return [k, v];
       }
     })
-  ) as AffineTextAttributes;
+  );
 
   inlineEditor.formatText(inlineRange, newAttributes, {
     mode: 'merge',

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

@@ -338,7 +338,6 @@ export class EmbedLinkedDocBlockComponent extends EmbedBlockComponent<EmbedLinke
       'note-empty': this.isNoteContentEmpty,
       'in-canvas': inCanvas,
       [this._cardStyle]: true,
-      'comment-highlighted': this.isCommentHighlighted,
     });
 
     const theme = this.std.get(ThemeProvider).theme;

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

@@ -5,4 +5,3 @@ export * from './edgeless-clipboard-config';
 export * from './embed-edgeless-linked-doc-block';
 export * from './embed-linked-doc-block';
 export * from './embed-linked-doc-spec';
-export { getEmbedLinkedDocIcons } from './utils';

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

@@ -9,16 +9,12 @@ export const styles = css`
     width: 100%;
     height: 100%;
     border-radius: 8px;
-    border: 1px solid ${unsafeCSSVarV2('layer/background/tertiary')};
+    border: 1px solid var(--affine-background-tertiary-color);
     background: ${unsafeCSSVarV2('layer/background/primary')};
     user-select: none;
     position: relative;
   }
 
-  .affine-embed-linked-doc-block.comment-highlighted {
-    outline: 2px solid ${unsafeCSSVarV2('block/comment/highlightUnderline')};
-  }
-
   .affine-embed-linked-doc-block.in-canvas {
     border: 1px solid ${unsafeCSSVarV2('layer/insideBorder/border')};
     background: ${unsafeCSSVarV2('layer/background/linkedDocOnEdgeless')};
@@ -168,7 +164,6 @@ export const styles = css`
   .affine-embed-linked-doc-banner {
     margin: 12px 12px 0px 0px;
     width: 204px;
-    min-width: 204px;
     max-width: 100%;
     height: 102px;
     pointer-events: none;

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

@@ -232,7 +232,6 @@ export class EmbedSyncedDocBlockComponent extends EmbedBlockComponent<EmbedSynce
             surface: false,
             selected: this.selected$.value,
             'show-hover-border': true,
-            'comment-highlighted': this.isCommentHighlighted,
           })}
           @click=${this._handleClick}
           style=${containerStyleMap}

blocksuite/affine/blocks/embed-doc/src/embed-synced-doc-block/styles.ts

@@ -57,9 +57,6 @@ export const blockStyles = css`
     border-radius: 8px;
     overflow: hidden;
   }
-  .affine-embed-synced-doc-container.comment-highlighted {
-    outline: 2px solid ${unsafeCSSVarV2('block/comment/highlightUnderline')};
-  }
   .affine-embed-synced-doc-container.show-hover-border:hover {
     border-color: var(--affine-border-color);
   }
@@ -197,8 +194,8 @@ export const cardStyles = css`
     width: 100%;
     height: ${EMBED_CARD_HEIGHT.horizontal}px;
     border-radius: 8px;
-    border: 1px solid ${unsafeCSSVarV2('layer/background/tertiary')};
-    background: ${unsafeCSSVarV2('layer/background/primary')};
+    border: 1px solid var(--affine-background-tertiary-color);
+    background: var(--affine-background-primary-color);
     user-select: none;
   }
 

blocksuite/affine/blocks/embed/src/common/embed-block-element.ts

@@ -2,20 +2,17 @@ import {
   CaptionedBlockComponent,
   SelectedStyle,
 } from '@blocksuite/affine-components/caption';
-import type { EmbedCardStyle, EmbedProps } from '@blocksuite/affine-model';
+import type { EmbedCardStyle } from '@blocksuite/affine-model';
 import {
   EMBED_CARD_HEIGHT,
   EMBED_CARD_MIN_WIDTH,
   EMBED_CARD_WIDTH,
 } from '@blocksuite/affine-shared/consts';
-import {
-  BlockElementCommentManager,
-  DocModeProvider,
-} from '@blocksuite/affine-shared/services';
-import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
+import { DocModeProvider } from '@blocksuite/affine-shared/services';
 import { findAncestorModel } from '@blocksuite/affine-shared/utils';
 import type { BlockService } from '@blocksuite/std';
 import {
+  type GfxCompatibleProps,
   GfxViewInteractionExtension,
   type ResizeConstraint,
 } from '@blocksuite/std/gfx';
@@ -28,7 +25,7 @@ import { type ClassInfo, classMap } from 'lit/directives/class-map.js';
 import { type StyleInfo, styleMap } from 'lit/directives/style-map.js';
 
 export class EmbedBlockComponent<
-  Model extends BlockModel<EmbedProps> = BlockModel<EmbedProps>,
+  Model extends BlockModel<GfxCompatibleProps> = BlockModel<GfxCompatibleProps>,
   Service extends BlockService = BlockService,
   WidgetName extends string = string,
 > extends CaptionedBlockComponent<Model, Service, WidgetName> {
@@ -62,14 +59,6 @@ export class EmbedBlockComponent<
    */
   protected embedContainerStyle: StyleInfo = {};
 
-  get isCommentHighlighted() {
-    return (
-      this.std
-        .getOptional(BlockElementCommentManager)
-        ?.isBlockCommentHighlighted(this.model) ?? false
-    );
-  }
-
   renderEmbed = (content: () => TemplateResult) => {
     if (
       this._cardStyle === 'horizontal' ||
@@ -101,11 +90,6 @@ export class EmbedBlockComponent<
         style=${styleMap({
           height: `${this._cardHeight}px`,
           width: '100%',
-          ...(this.isCommentHighlighted
-            ? {
-                border: `2px solid ${unsafeCSSVarV2('block/comment/highlightUnderline')}`,
-              }
-            : {}),
           ...this.embedContainerStyle,
         })}
       >

blocksuite/affine/blocks/embed/src/common/embed-note-content-styles.ts

@@ -57,11 +57,6 @@ export const embedNoteContentStyles = css`
     font-weight: 600;
   }
 
-  .affine-embed-doc-content-note-blocks inline-comment {
-    background-color: unset !important;
-    border-bottom: unset !important;
-  }
-
   .affine-embed-linked-doc-block.horizontal {
     affine-paragraph,
     affine-list {

blocksuite/affine/blocks/embed/src/common/to-edgeless-embed-block.ts

@@ -1,5 +1,4 @@
 import { EdgelessLegacySlotIdentifier } from '@blocksuite/affine-block-surface';
-import type { EmbedProps } from '@blocksuite/affine-model';
 import { Bound } from '@blocksuite/global/gfx';
 import {
   blockComponentSymbol,
@@ -8,13 +7,16 @@ import {
   GfxElementSymbol,
   toGfxBlockComponent,
 } from '@blocksuite/std';
-import type { GfxBlockElementModel } from '@blocksuite/std/gfx';
+import type {
+  GfxBlockElementModel,
+  GfxCompatibleProps,
+} from '@blocksuite/std/gfx';
 import type { StyleInfo } from 'lit/directives/style-map.js';
 
 import type { EmbedBlockComponent } from './embed-block-element.js';
 
 export function toEdgelessEmbedBlock<
-  Model extends GfxBlockElementModel<EmbedProps>,
+  Model extends GfxBlockElementModel<GfxCompatibleProps>,
   Service extends BlockService,
   WidgetName extends string,
   B extends typeof EmbedBlockComponent<Model, Service, WidgetName>,

blocksuite/affine/blocks/embed/src/embed-figma-block/styles.ts

@@ -11,9 +11,9 @@ export const styles = css`
     height: 100%;
 
     border-radius: 8px;
-    border: 1px solid ${unsafeCSSVarV2('layer/background/tertiary')};
+    border: 1px solid var(--affine-background-tertiary-color);
 
-    background: ${unsafeCSSVarV2('layer/background/primary')};
+    background: var(--affine-background-primary-color);
     user-select: none;
   }
 

blocksuite/affine/blocks/embed/src/embed-github-block/styles.ts

@@ -1,4 +1,3 @@
-import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
 import { css, html } from 'lit';
 
 export const styles = css`
@@ -10,9 +9,9 @@ export const styles = css`
     height: 100%;
 
     border-radius: 8px;
-    border: 1px solid ${unsafeCSSVarV2('layer/background/tertiary')};
+    border: 1px solid var(--affine-background-tertiary-color);
 
-    background: ${unsafeCSSVarV2('layer/background/primary')};
+    background: var(--affine-background-primary-color);
     user-select: none;
     overflow: hidden;
   }

blocksuite/affine/blocks/embed/src/embed-html-block/styles.ts

@@ -1,4 +1,3 @@
-import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
 import { css, html } from 'lit';
 
 export const EMBED_HTML_MIN_WIDTH = 370;
@@ -16,9 +15,9 @@ export const styles = css`
     gap: 20px;
 
     border-radius: 12px;
-    border: 1px solid ${unsafeCSSVarV2('layer/background/tertiary')};
+    border: 1px solid var(--affine-background-tertiary-color);
 
-    background: ${unsafeCSSVarV2('layer/background/primary')};
+    background: var(--affine-background-primary-color);
     user-select: none;
   }
 

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

@@ -11,7 +11,6 @@ import {
   type IframeOptions,
   LinkPreviewServiceIdentifier,
   NotificationProvider,
-  VirtualKeyboardProvider,
 } from '@blocksuite/affine-shared/services';
 import { matchModels } from '@blocksuite/affine-shared/utils';
 import { BlockSuiteError, ErrorCode } from '@blocksuite/global/exceptions';
@@ -214,33 +213,9 @@ export class EmbedIframeBlockComponent extends CaptionedBlockComponent<EmbedIfra
       this._linkInputAbortController.abort();
     }
 
-    const keyboard = this.host.std.getOptional(VirtualKeyboardProvider);
-    const computePosition = keyboard
-      ? {
-          referenceElement: document.body,
-          placement: 'top' as const,
-          middleware: [
-            offset(({ rects }) => ({
-              mainAxis:
-                -rects.floating.height -
-                (window.innerHeight -
-                  rects.floating.height -
-                  keyboard.height$.value) /
-                  2,
-            })),
-          ],
-          autoUpdate: { animationFrame: true },
-        }
-      : {
-          referenceElement: this._blockContainer,
-          placement: 'bottom' as const,
-          middleware: [flip(), offset(LINK_CREATE_POPUP_OFFSET), shift()],
-          autoUpdate: { animationFrame: true },
-        };
-
     this._linkInputAbortController = new AbortController();
 
-    const { update } = createLitPortal({
+    createLitPortal({
       template: html`<embed-iframe-link-input-popup
         .model=${this.model}
         .abortController=${this._linkInputAbortController}
@@ -249,19 +224,15 @@ export class EmbedIframeBlockComponent extends CaptionedBlockComponent<EmbedIfra
         .options=${options}
       ></embed-iframe-link-input-popup>`,
       container: document.body,
-      computePosition,
+      computePosition: {
+        referenceElement: this._blockContainer,
+        placement: 'bottom',
+        middleware: [flip(), offset(LINK_CREATE_POPUP_OFFSET), shift()],
+        autoUpdate: { animationFrame: true },
+      },
       abortController: this._linkInputAbortController,
       closeOnClickAway: true,
     });
-
-    if (keyboard) {
-      this._linkInputAbortController.signal.addEventListener(
-        'abort',
-        keyboard.height$.subscribe(() => {
-          update();
-        })
-      );
-    }
   };
 
   /**

blocksuite/affine/blocks/embed/src/embed-loom-block/styles.ts

@@ -1,4 +1,3 @@
-import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
 import { css, html } from 'lit';
 
 export const styles = css`
@@ -13,9 +12,9 @@ export const styles = css`
     height: 100%;
 
     border-radius: 8px;
-    border: 1px solid ${unsafeCSSVarV2('layer/background/tertiary')};
+    border: 1px solid var(--affine-background-tertiary-color);
 
-    background: ${unsafeCSSVarV2('layer/background/primary')};
+    background: var(--affine-background-primary-color);
     user-select: none;
   }
 

blocksuite/affine/blocks/embed/src/embed-youtube-block/styles.ts

@@ -13,9 +13,9 @@ export const styles = css`
     padding: 12px;
 
     border-radius: 8px;
-    border: 1px solid ${unsafeCSSVarV2('layer/background/tertiary')};
+    border: 1px solid var(--affine-background-tertiary-color);
 
-    background: ${unsafeCSSVarV2('layer/background/primary')};
+    background: var(--affine-background-primary-color);
     user-select: none;
   }
 

blocksuite/affine/blocks/image/src/components/page-image-block.ts

@@ -18,7 +18,6 @@ import type { BaseSelection } from '@blocksuite/store';
 import { computed } from '@preact/signals-core';
 import { css, html, type PropertyValues } from 'lit';
 import { property, query } from 'lit/decorators.js';
-import { classMap } from 'lit/directives/class-map.js';
 import { styleMap } from 'lit/directives/style-map.js';
 import { when } from 'lit/directives/when.js';
 
@@ -77,10 +76,6 @@ export class ImageBlockPageComponent extends SignalWatcher(
       width: 100%;
       height: 100%;
     }
-
-    affine-page-image .comment-highlighted {
-      outline: 2px solid ${unsafeCSSVarV2('block/comment/highlightUnderline')};
-    }
   `;
 
   resizeable$ = computed(() => this.block.resizeable$.value);
@@ -369,13 +364,7 @@ export class ImageBlockPageComponent extends SignalWatcher(
     const { loading, error, icon, description, needUpload } = this.state;
 
     return html`
-      <div
-        class=${classMap({
-          'resizable-img': true,
-          'comment-highlighted': this.block.isCommentHighlighted,
-        })}
-        style=${styleMap(imageSize)}
-      >
+      <div class="resizable-img" style=${styleMap(imageSize)}>
         <img
           class="drag-target"
           draggable="false"

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

@@ -5,10 +5,7 @@ import { Peekable } from '@blocksuite/affine-components/peek';
 import { ResourceController } from '@blocksuite/affine-components/resource';
 import type { ImageBlockModel } from '@blocksuite/affine-model';
 import { ImageSelection } from '@blocksuite/affine-shared/selection';
-import {
-  BlockElementCommentManager,
-  ToolbarRegistryIdentifier,
-} from '@blocksuite/affine-shared/services';
+import { ToolbarRegistryIdentifier } from '@blocksuite/affine-shared/services';
 import { formatSize } from '@blocksuite/affine-shared/utils';
 import { IS_MOBILE } from '@blocksuite/global/env';
 import { BrokenImageIcon, ImageIcon } from '@blocksuite/icons/lit';
@@ -68,14 +65,6 @@ export class ImageBlockComponent extends CaptionedBlockComponent<ImageBlockModel
     return this.pageImage?.resizeImg;
   }
 
-  get isCommentHighlighted() {
-    return (
-      this.std
-        .getOptional(BlockElementCommentManager)
-        ?.isBlockCommentHighlighted(this.model) ?? false
-    );
-  }
-
   private _handleClick(event: MouseEvent) {
     // the peek view need handle shift + click
     if (event.defaultPrevented) return;

blocksuite/affine/blocks/image/src/preview-image/edgeless.ts

@@ -1,4 +1,3 @@
-import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
 import { toGfxBlockComponent } from '@blocksuite/std';
 import { css } from 'lit';
 
@@ -10,7 +9,7 @@ export class ImageEdgelessPlaceholderBlockComponent extends toGfxBlockComponent(
   static override styles = css`
     affine-edgeless-placeholder-preview-image
       .affine-placeholder-preview-container {
-      border: 1px solid ${unsafeCSSVarV2('layer/background/tertiary')};
+      border: 1px solid var(--affine-background-tertiary-color);
     }
   `;
 

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

@@ -116,7 +116,7 @@ export class LatexBlockComponent extends CaptionedBlockComponent<LatexBlockModel
 
     this.selection.setGroup('note', []);
 
-    const { portal } = createLitPortal({
+    const portal = createLitPortal({
       template: html`<latex-editor-menu
         .std=${this.std}
         .latexSignal=${this.model.props.latex$}

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

@@ -8,7 +8,6 @@ import {
   EDGELESS_TOP_CONTENTEDITABLE_SELECTOR,
 } from '@blocksuite/affine-shared/consts';
 import {
-  BlockElementCommentManager,
   CitationProvider,
   DocModeProvider,
 } from '@blocksuite/affine-shared/services';
@@ -109,14 +108,6 @@ export class ParagraphBlockComponent extends CaptionedBlockComponent<ParagraphBl
     );
   }
 
-  get isCommentHighlighted() {
-    return (
-      this.std
-        .getOptional(BlockElementCommentManager)
-        ?.isBlockCommentHighlighted(this.model) ?? false
-    );
-  }
-
   override get topContenteditableElement() {
     if (this.std.get(DocModeProvider).getEditorMode() === 'edgeless') {
       return this.closest<BlockComponent>(
@@ -284,10 +275,7 @@ export class ParagraphBlockComponent extends CaptionedBlockComponent<ParagraphBl
         }
       </style>
       <div
-        class=${classMap({
-          'affine-paragraph-block-container': true,
-          'highlight-comment': this.isCommentHighlighted,
-        })}
+        class="affine-paragraph-block-container"
         data-has-collapsed-siblings="${collapsedSiblings.length > 0}"
       >
         <div

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

@@ -1,4 +1,3 @@
-import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
 import { css } from 'lit';
 
 export const paragraphBlockStyles = css`
@@ -16,11 +15,6 @@ export const paragraphBlockStyles = css`
     position: relative;
   }
 
-  .affine-paragraph-block-container.highlight-comment {
-    background-color: ${unsafeCSSVarV2('block/comment/highlightActive')};
-    outline: 2px solid ${unsafeCSSVarV2('block/comment/highlightUnderline')};
-  }
-
   affine-paragraph code {
     font-size: calc(var(--affine-font-base) - 3px);
     padding: 0px 4px 2px;

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

@@ -9,7 +9,6 @@ import {
   promptDocTitle,
 } from '@blocksuite/affine-block-embed';
 import { updateBlockType } from '@blocksuite/affine-block-note';
-import type { HighlightType } from '@blocksuite/affine-components/highlight-dropdown-menu';
 import { toast } from '@blocksuite/affine-components/toast';
 import { EditorChevronDown } from '@blocksuite/affine-components/toolbar';
 import {
@@ -20,10 +19,6 @@ import {
   isFormatSupported,
   textFormatConfigs,
 } from '@blocksuite/affine-inline-preset';
-import {
-  EmbedLinkedDocBlockSchema,
-  EmbedSyncedDocBlockSchema,
-} from '@blocksuite/affine-model';
 import { textConversionConfigs } from '@blocksuite/affine-rich-text';
 import {
   copySelectedModelsCommand,
@@ -42,10 +37,8 @@ import type {
   ToolbarActionGroup,
   ToolbarModuleConfig,
 } from '@blocksuite/affine-shared/services';
-import {
-  ActionPlacement,
-  blockCommentToolbarButton,
-} from '@blocksuite/affine-shared/services';
+import { ActionPlacement } from '@blocksuite/affine-shared/services';
+import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
 import { tableViewMeta } from '@blocksuite/data-view/view-presets';
 import {
   CopyIcon,
@@ -54,11 +47,7 @@ import {
   DuplicateIcon,
   LinkedPageIcon,
 } from '@blocksuite/icons/lit';
-import {
-  type BlockComponent,
-  BlockSelection,
-  BlockViewIdentifier,
-} from '@blocksuite/std';
+import { type BlockComponent, BlockSelection } from '@blocksuite/std';
 import { toDraftModel } from '@blocksuite/store';
 import { html } from 'lit';
 import { repeat } from 'lit/directives/repeat.js';
@@ -151,7 +140,7 @@ const highlightActionGroup = {
   id: 'c.highlight',
   when: ({ chain }) => isFormatSupported(chain).run()[0],
   content({ chain }) {
-    const updateHighlight = (styles: HighlightType) => {
+    const updateHighlight = (styles: AffineTextAttributes) => {
       const payload = { styles };
       chain
         .try(chain => [
@@ -172,7 +161,7 @@ const highlightActionGroup = {
 } as const satisfies ToolbarAction;
 
 const turnIntoDatabase = {
-  id: 'e.convert-to-database',
+  id: 'd.convert-to-database',
   tooltip: 'Create Table',
   icon: DatabaseTableViewIcon(),
   when({ chain }) {
@@ -219,21 +208,10 @@ const turnIntoDatabase = {
 } as const satisfies ToolbarAction;
 
 const turnIntoLinkedDoc = {
-  id: 'f.convert-to-linked-doc',
+  id: 'e.convert-to-linked-doc',
   tooltip: 'Create Linked Doc',
   icon: LinkedPageIcon(),
-  when({ chain, std }) {
-    const supportFlavours = [
-      EmbedLinkedDocBlockSchema,
-      EmbedSyncedDocBlockSchema,
-    ].map(schema => schema.model.flavour);
-    if (
-      supportFlavours.some(
-        flavour => !std.getOptional(BlockViewIdentifier(flavour))
-      )
-    )
-      return false;
-
+  when({ chain }) {
     const [ok, { selectedModels }] = chain
       .pipe(getSelectedModelsCommand, {
         types: ['block', 'text'],
@@ -295,10 +273,6 @@ export const builtinToolbarConfig = {
     highlightActionGroup,
     turnIntoDatabase,
     turnIntoLinkedDoc,
-    {
-      id: 'g.comment',
-      ...blockCommentToolbarButton,
-    },
     {
       placement: ActionPlacement.More,
       id: 'a.clipboard',

blocksuite/affine/blocks/root/src/edgeless/configs/toolbar/misc.ts

@@ -17,7 +17,6 @@ import {
 } from '@blocksuite/affine-model';
 import {
   ActionPlacement,
-  blockCommentToolbarButton,
   type ElementLockEvent,
   type ToolbarAction,
   type ToolbarContext,
@@ -306,12 +305,6 @@ export const builtinMiscToolbarConfig = {
       },
     },
 
-    {
-      placement: ActionPlacement.End,
-      id: 'c.comment',
-      ...blockCommentToolbarButton,
-    },
-
     // More actions
     ...moreActions.map(action => ({
       ...action,

blocksuite/affine/blocks/root/src/page/page-root-block.ts

@@ -305,10 +305,7 @@ export class PageRootBlockComponent extends BlockComponent<RootBlockModel> {
       );
 
       // make sure there is a block can be focused
-      if (
-        !this.store.readonly$.value &&
-        (notes.length === 0 || notes[notes.length - 1].children.length === 0)
-      ) {
+      if (notes.length === 0 || notes[notes.length - 1].children.length === 0) {
         this.std.command.exec(appendParagraphCommand);
         return;
       }
@@ -325,7 +322,7 @@ export class PageRootBlockComponent extends BlockComponent<RootBlockModel> {
         parseFloat(paddingLeft),
         parseFloat(paddingRight)
       );
-      if (!isClickOnBlankArea && !this.store.readonly$.value) {
+      if (!isClickOnBlankArea) {
         const lastBlock = notes[notes.length - 1].lastChild();
         if (
           !lastBlock ||

blocksuite/affine/blocks/surface-ref/src/surface-ref-block.ts

@@ -13,7 +13,6 @@ import {
   type SurfaceRefBlockModel,
 } from '@blocksuite/affine-model';
 import {
-  BlockElementCommentManager,
   DocModeProvider,
   EditPropsStore,
   type OpenDocMode,
@@ -77,10 +76,6 @@ export class SurfaceRefBlockComponent extends BlockComponent<SurfaceRefBlockMode
       border-color: ${unsafeCSSVarV2('edgeless/frame/border/active')};
     }
 
-    .affine-surface-ref.comment-highlighted {
-      outline: 2px solid ${unsafeCSSVarV2('block/comment/highlightUnderline')};
-    }
-
     @media print {
       .affine-surface-ref {
         outline: none !important;
@@ -142,14 +137,6 @@ export class SurfaceRefBlockComponent extends BlockComponent<SurfaceRefBlockMode
     return this._referencedModel;
   }
 
-  get isCommentHighlighted() {
-    return (
-      this.std
-        .getOptional(BlockElementCommentManager)
-        ?.isBlockCommentHighlighted(this.model) ?? false
-    );
-  }
-
   private readonly _handleClick = () => {
     this.selection.update(() => {
       return [this.selection.create(BlockSelection, { blockId: this.blockId })];
@@ -469,7 +456,6 @@ export class SurfaceRefBlockComponent extends BlockComponent<SurfaceRefBlockMode
         class=${classMap({
           'affine-surface-ref': true,
           focused: this.selected$.value,
-          'comment-highlighted': this.isCommentHighlighted,
         })}
         @click=${this._handleClick}
       >

blocksuite/affine/components/package.json

@@ -73,8 +73,7 @@
     "./edgeless-line-styles-panel": "./src/edgeless-line-styles-panel/index.ts",
     "./edgeless-shape-color-picker": "./src/edgeless-shape-color-picker/index.ts",
     "./open-doc-dropdown-menu": "./src/open-doc-dropdown-menu/index.ts",
-    "./slider": "./src/slider/index.ts",
-    "./tooltip": "./src/tooltip/index.ts"
+    "./slider": "./src/slider/index.ts"
   },
   "files": [
     "src",

blocksuite/affine/components/src/context-menu/sub-menu.ts

@@ -85,8 +85,6 @@ export class MenuSubMenu extends MenuFocusable {
         .catch(err => console.error(err));
     });
     this.menu.openSubMenu(menu);
-    // in case that the menu is not closed, but the component is removed,
-    this.disposables.add(unsub);
   }
 
   protected override render(): unknown {

blocksuite/affine/components/src/highlight-dropdown-menu/dropdown-menu.ts

@@ -1,4 +1,4 @@
-import type { AffineTextStyleAttributes } from '@blocksuite/affine-shared/types';
+import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
 import { PropTypes, requiredProperties } from '@blocksuite/std';
 import { LitElement } from 'lit';
 import { property } from 'lit/decorators.js';
@@ -20,10 +20,7 @@ const colors = [
   'grey',
 ] as const;
 
-export type HighlightType = Pick<
-  AffineTextStyleAttributes,
-  'color' | 'background'
->;
+type HighlightType = 'color' | 'background';
 
 // TODO(@fundon): these recent settings should be added to the dropdown menu
 // tests/blocksutie/e2e/format-bar.spec.ts#253
@@ -36,13 +33,13 @@ export type HighlightType = Pick<
 })
 export class HighlightDropdownMenu extends LitElement {
   @property({ attribute: false })
-  accessor updateHighlight!: (styles: HighlightType) => void;
+  accessor updateHighlight!: (styles: AffineTextAttributes) => void;
 
-  private readonly _update = (style: HighlightType) => {
+  private readonly _update = (value: string | null, type: HighlightType) => {
     // latestHighlightColor = value;
     // latestHighlightType = type;
 
-    this.updateHighlight(style);
+    this.updateHighlight({ [`${type}`]: value });
   };
 
   override render() {
@@ -74,7 +71,7 @@ export class HighlightDropdownMenu extends LitElement {
             return html`
               <editor-menu-action
                 data-testid="foreground-${color}"
-                @click=${() => this._update({ color: value })}
+                @click=${() => this._update(value, 'color')}
               >
                 <affine-text-duotone-icon
                   style=${styleMap({
@@ -95,7 +92,7 @@ export class HighlightDropdownMenu extends LitElement {
             return html`
               <editor-menu-action
                 data-testid="background-${color}"
-                @click=${() => this._update({ background: value })}
+                @click=${() => this._update(value, 'background')}
               >
                 <affine-text-duotone-icon
                   style=${styleMap({

blocksuite/affine/components/src/hover/controller.ts

@@ -179,7 +179,7 @@ export class HoverController implements ReactiveController {
       this._portal = createLitPortal({
         ...portalOptions,
         abortController: this._abortController,
-      }).portal;
+      });
 
       const transition = this._hoverOptions.transition;
       if (transition) {

blocksuite/affine/components/src/icons/loading.ts

@@ -18,7 +18,6 @@ export const LoadingIcon = ({
     viewBox="0 0 24 24"
     xmlns="http://www.w3.org/2000/svg"
     fill="none"
-    style="fill: none;"
   >
     <style>
       .spinner {

blocksuite/affine/components/src/portal/helper.ts

@@ -161,7 +161,7 @@ export function createLitPortal({
   }
 
   if (!positionConfigOrFn) {
-    return { portal: portalRoot, update: () => {} };
+    return portalRoot;
   }
 
   const visibility = portalRoot.style.visibility;
@@ -221,5 +221,5 @@ export function createLitPortal({
     });
   }
 
-  return { portal: portalRoot, update };
+  return portalRoot;
 }

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

@@ -1,4 +1,3 @@
-import { effects as tooltipEffects } from '../tooltip/effect.js';
 import { EditorIconButton } from './icon-button.js';
 import {
   EditorMenuAction,
@@ -7,6 +6,7 @@ import {
 } from './menu-button.js';
 import { EditorToolbarSeparator } from './separator.js';
 import { EditorToolbar } from './toolbar.js';
+import { Tooltip } from './tooltip.js';
 
 export { EditorChevronDown } from './chevron-down.js';
 export { ToolbarMoreMenuConfigExtension } from './config.js';
@@ -20,6 +20,7 @@ export { MenuContext } from './menu-context.js';
 export { EditorToolbarSeparator } from './separator.js';
 export { darkToolbarStyles, lightToolbarStyles } from './styles.js';
 export { EditorToolbar } from './toolbar.js';
+export { Tooltip } from './tooltip.js';
 export type {
   AdvancedMenuItem,
   FatMenuItems,
@@ -37,12 +38,11 @@ export {
 } from './utils.js';
 
 export function effects() {
-  tooltipEffects();
-
   customElements.define('editor-toolbar-separator', EditorToolbarSeparator);
   customElements.define('editor-toolbar', EditorToolbar);
   customElements.define('editor-icon-button', EditorIconButton);
   customElements.define('editor-menu-button', EditorMenuButton);
   customElements.define('editor-menu-content', EditorMenuContent);
   customElements.define('editor-menu-action', EditorMenuAction);
+  customElements.define('affine-tooltip', Tooltip);
 }

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

@@ -190,10 +190,7 @@ export class Tooltip extends LitElement {
             middleware: [
               this.autoFlip && flip({ padding: AUTO_FLIP_PADDING }),
               this.autoShift && shift({ padding: AUTO_SHIFT_PADDING }),
-              offset({
-                mainAxis: (this.arrow ? TRIANGLE_HEIGHT : 0) + this.offsetY,
-                crossAxis: this.offsetX,
-              }),
+              offset((this.arrow ? TRIANGLE_HEIGHT : 0) + this.offset),
               arrow({
                 element: portalRoot.shadowRoot!.querySelector('.arrow')!,
               }),
@@ -267,7 +264,7 @@ export class Tooltip extends LitElement {
    * Show a triangle arrow pointing to the reference element.
    */
   @property({ attribute: false })
-  accessor arrow = false;
+  accessor arrow = true;
 
   /**
    * changes the placement of the floating element in order to keep it in view,
@@ -306,10 +303,7 @@ export class Tooltip extends LitElement {
    * See https://floating-ui.com/docs/offset
    */
   @property({ attribute: false })
-  accessor offsetY = 6;
-
-  @property({ attribute: false })
-  accessor offsetX = 0;
+  accessor offset = 4;
 
   @property({ attribute: 'tip-position' })
   accessor placement: Placement = 'top';

blocksuite/affine/components/src/tooltip/effect.ts

@@ -1,7 +0,0 @@
-import { Tooltip } from './tooltip.js';
-
-export function effects() {
-  if (!customElements.get('affine-tooltip')) {
-    customElements.define('affine-tooltip', Tooltip);
-  }
-}

blocksuite/affine/components/src/tooltip/index.ts

@@ -1,2 +0,0 @@
-export { effects } from './effect.js';
-export { Tooltip } from './tooltip.js';

blocksuite/affine/data-view/src/property-presets/date/cell-renderer.ts

@@ -78,7 +78,7 @@ export class DateCell extends BaseCellRenderer<number, number> {
         },
       });
     } else {
-      const { portal } = createLitPortal({
+      const root = createLitPortal({
         abortController,
         closeOnClickAway: true,
         computePosition: {
@@ -107,7 +107,7 @@ export class DateCell extends BaseCellRenderer<number, number> {
       //       for now the slide-layout-modal's z-index is `1001`
       //       the z-index of popover should be higher than it
       // root.style.zIndex = 'var(--affine-z-index-popover)';
-      portal.style.zIndex = '1002';
+      root.style.zIndex = '1002';
     }
   };
 

blocksuite/affine/foundation/package.json

@@ -32,7 +32,6 @@
   },
   "exports": {
     ".": "./src/index.ts",
-    "./clipboard": "./src/clipboard.ts",
     "./store": "./src/store.ts",
     "./view": "./src/view.ts"
   },

blocksuite/affine/foundation/src/clipboard.ts

@@ -43,7 +43,7 @@ const imageClipboardConfigs = [
   });
 });
 
-export const PlainTextClipboardConfig = ClipboardAdapterConfigExtension({
+const PlainTextClipboardConfig = ClipboardAdapterConfigExtension({
   mimeType: 'text/plain',
   adapter: MixTextAdapter,
   priority: 70,

blocksuite/affine/foundation/src/view.ts

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

blocksuite/affine/gfx/template/src/toolbar/template-tool-button.ts

@@ -116,7 +116,6 @@ export class EdgelessTemplateButton extends EdgelessToolbarToolMixin(
   `;
 
   private _cleanup: (() => void) | null = null;
-  private _autoUpdateCleanup: (() => void) | null = null;
 
   private _prevTool: ToolOptionWithType | null = null;
 
@@ -129,11 +128,6 @@ export class EdgelessTemplateButton extends EdgelessToolbarToolMixin(
     return [TemplateCard1[theme], TemplateCard2[theme], TemplateCard3[theme]];
   }
 
-  override connectedCallback() {
-    super.connectedCallback();
-    this.disposables.add(() => this._autoUpdateCleanup?.());
-  }
-
   private _closePanel() {
     if (this._openedPanel) {
       this._openedPanel.remove();
@@ -181,8 +175,8 @@ export class EdgelessTemplateButton extends EdgelessToolbarToolMixin(
 
     requestAnimationFrame(() => {
       const arrowEl = panel.renderRoot.querySelector('.arrow') as HTMLElement;
-      this._autoUpdateCleanup?.();
-      this._autoUpdateCleanup = autoUpdate(this, panel, () => {
+
+      autoUpdate(this, panel, () => {
         computePosition(this, panel, {
           placement: 'top',
           middleware: [offset(20), arrow({ element: arrowEl }), shift()],

blocksuite/affine/gfx/text/src/toolbar/actions.ts

@@ -17,9 +17,9 @@ import {
   TextAlign,
   type TextStyleProps,
 } from '@blocksuite/affine-model';
-import {
-  type ToolbarActions,
-  type ToolbarContext,
+import type {
+  ToolbarActions,
+  ToolbarContext,
 } from '@blocksuite/affine-shared/services';
 import {
   getMostCommonResolvedValue,

blocksuite/affine/inlines/comment/package.json

@@ -1,46 +0,0 @@
-{
-  "name": "@blocksuite/affine-inline-comment",
-  "description": "Inline comment for BlockSuite.",
-  "type": "module",
-  "scripts": {
-    "build": "tsc"
-  },
-  "sideEffects": false,
-  "keywords": [],
-  "author": "toeverything",
-  "license": "MIT",
-  "dependencies": {
-    "@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/store": "workspace:*",
-    "@lit/context": "^1.1.2",
-    "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
-    "@types/lodash-es": "^4.17.12",
-    "lit": "^3.2.0",
-    "lit-html": "^3.2.1",
-    "lodash-es": "^4.17.21",
-    "rxjs": "^7.8.1",
-    "yjs": "^13.6.21",
-    "zod": "^3.23.8"
-  },
-  "devDependencies": {
-    "vitest": "3.1.3"
-  },
-  "exports": {
-    ".": "./src/index.ts",
-    "./view": "./src/view.ts",
-    "./store": "./src/store.ts"
-  },
-  "files": [
-    "src",
-    "dist",
-    "!src/__tests__",
-    "!dist/__tests__"
-  ],
-  "version": "0.21.0"
-}

blocksuite/affine/inlines/comment/src/effects.ts

@@ -1,11 +0,0 @@
-import { InlineComment } from './inline-comment';
-
-export function effects() {
-  customElements.define('inline-comment', InlineComment);
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    'inline-comment': InlineComment;
-  }
-}

blocksuite/affine/inlines/comment/src/index.ts

@@ -1,4 +0,0 @@
-export { InlineCommentManager } from './inline-comment-manager';
-export * from './inline-spec';
-export * from './utils';
-export * from './view';

blocksuite/affine/inlines/comment/src/inline-comment-manager.ts

@@ -1,232 +0,0 @@
-import { getInlineEditorByModel } from '@blocksuite/affine-rich-text';
-import { getSelectedBlocksCommand } from '@blocksuite/affine-shared/commands';
-import {
-  BlockElementCommentManager,
-  type CommentId,
-  CommentProviderIdentifier,
-  findAllCommentedBlocks,
-  findAllCommentedElements,
-} from '@blocksuite/affine-shared/services';
-import type { AffineInlineEditor } from '@blocksuite/affine-shared/types';
-import { DisposableGroup } from '@blocksuite/global/disposable';
-import {
-  LifeCycleWatcher,
-  type TextRangePoint,
-  TextSelection,
-} from '@blocksuite/std';
-import type { BaseSelection, BlockModel } from '@blocksuite/store';
-import { signal } from '@preact/signals-core';
-import difference from 'lodash-es/difference';
-
-import {
-  extractCommentIdFromDelta,
-  findAllCommentedTexts,
-  findCommentedTexts,
-} from './utils';
-
-export class InlineCommentManager extends LifeCycleWatcher {
-  static override key = 'inline-comment-manager';
-
-  private readonly _disposables = new DisposableGroup();
-
-  private readonly _highlightedCommentId$ = signal<CommentId | null>(null);
-
-  private get _provider() {
-    return this.std.getOptional(CommentProviderIdentifier);
-  }
-
-  override mounted() {
-    const provider = this._provider;
-    if (!provider) return;
-
-    this._init().catch(console.error);
-
-    this._disposables.add(provider.onCommentAdded(this._handleAddComment));
-    this._disposables.add(
-      provider.onCommentDeleted(id =>
-        this._handleDeleteAndResolve(id, 'delete')
-      )
-    );
-    this._disposables.add(
-      provider.onCommentResolved(id =>
-        this._handleDeleteAndResolve(id, 'resolve')
-      )
-    );
-    this._disposables.add(
-      provider.onCommentHighlighted(this._handleHighlightComment)
-    );
-    this._disposables.add(
-      this.std.selection.slots.changed.subscribe(this._handleSelectionChanged)
-    );
-  }
-
-  override unmounted() {
-    this._disposables.dispose();
-  }
-
-  private async _init() {
-    const provider = this._provider;
-    if (!provider) return;
-
-    const commentsInProvider = await provider.getComments('all');
-
-    const commentsInEditor = this.getCommentsInEditor();
-
-    // remove comments that are in editor but not in provider
-    // which means the comment may be removed or resolved in provider side
-    difference(commentsInEditor, commentsInProvider).forEach(comment => {
-      this.std
-        .get(BlockElementCommentManager)
-        .handleDeleteAndResolve(comment, 'delete');
-    });
-  }
-
-  getCommentsInEditor() {
-    const inlineComments = [...findAllCommentedTexts(this.std.store).values()];
-
-    const blockComments = findAllCommentedBlocks(this.std.store).flatMap(
-      block => Object.keys(block.props.comments)
-    );
-
-    const surfaceComments = findAllCommentedElements(this.std.store).flatMap(
-      element => Object.keys(element.comments)
-    );
-
-    const commentsInEditor = [
-      ...new Set([...inlineComments, ...blockComments, ...surfaceComments]),
-    ];
-
-    return commentsInEditor;
-  }
-
-  private readonly _handleAddComment = (
-    id: CommentId,
-    selections: BaseSelection[]
-  ) => {
-    const needCommentTexts = selections
-      .map(selection => {
-        if (!selection.is(TextSelection)) return [];
-        const [_, { selectedBlocks }] = this.std.command
-          .chain()
-          .pipe(getSelectedBlocksCommand, {
-            textSelection: selection,
-          })
-          .run();
-
-        if (!selectedBlocks) return [];
-
-        type MakeRequired<T, K extends keyof T> = T & {
-          [key in K]: NonNullable<T[key]>;
-        };
-
-        return selectedBlocks
-          .map(
-            ({ model }) =>
-              [model, getInlineEditorByModel(this.std, model)] as const
-          )
-          .filter(
-            (
-              pair
-            ): pair is [MakeRequired<BlockModel, 'text'>, AffineInlineEditor] =>
-              !!pair[0].text && !!pair[1]
-          )
-          .map(([model, inlineEditor]) => {
-            let from: TextRangePoint;
-            let to: TextRangePoint | null;
-            if (model.id === selection.from.blockId) {
-              from = selection.from;
-              to = null;
-            } else if (model.id === selection.to?.blockId) {
-              from = selection.to;
-              to = null;
-            } else {
-              from = {
-                blockId: model.id,
-                index: 0,
-                length: model.text.yText.length,
-              };
-              to = null;
-            }
-            return [new TextSelection({ from, to }), inlineEditor] as const;
-          });
-      })
-      .flat();
-
-    if (needCommentTexts.length === 0) return;
-
-    needCommentTexts.forEach(([selection, inlineEditor]) => {
-      inlineEditor.formatText(
-        selection.from,
-        {
-          [`comment-${id}`]: true,
-        },
-        {
-          withoutTransact: true,
-        }
-      );
-    });
-  };
-
-  private readonly _handleDeleteAndResolve = (
-    id: CommentId,
-    type: 'delete' | 'resolve'
-  ) => {
-    const commentedTexts = findCommentedTexts(this.std.store, id);
-    if (commentedTexts.length === 0) return;
-
-    this.std.store.withoutTransact(() => {
-      commentedTexts.forEach(selection => {
-        const inlineEditor = getInlineEditorByModel(
-          this.std,
-          selection.from.blockId
-        );
-
-        inlineEditor?.formatText(
-          selection.from,
-          {
-            [`comment-${id}`]: type === 'delete' ? null : false,
-          },
-          {
-            withoutTransact: true,
-          }
-        );
-      });
-    });
-  };
-
-  private readonly _handleHighlightComment = (id: CommentId | null) => {
-    this._highlightedCommentId$.value = id;
-  };
-
-  private readonly _handleSelectionChanged = (selections: BaseSelection[]) => {
-    const currentHighlightedCommentId = this._highlightedCommentId$.peek();
-
-    if (selections.length === 1) {
-      const selection = selections[0];
-
-      // InlineCommentManager only handle text selection
-      if (!selection.is(TextSelection)) return;
-
-      if (!selection.isCollapsed() && currentHighlightedCommentId !== null) {
-        this._provider?.highlightComment(null);
-        return;
-      }
-
-      const model = this.std.store.getModelById(selection.from.blockId);
-      if (!model) return;
-
-      const inlineEditor = getInlineEditorByModel(this.std, model);
-      if (!inlineEditor) return;
-
-      const delta = inlineEditor.getDeltaByRangeIndex(selection.from.index);
-      if (!delta) return;
-
-      const commentIds = extractCommentIdFromDelta(delta);
-      if (commentIds.length !== 0) return;
-    }
-
-    if (currentHighlightedCommentId !== null) {
-      this._provider?.highlightComment(null);
-    }
-  };
-}

blocksuite/affine/inlines/comment/src/inline-comment.ts

@@ -1,112 +0,0 @@
-import {
-  type CommentId,
-  CommentProviderIdentifier,
-} from '@blocksuite/affine-shared/services';
-import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
-import { WithDisposable } from '@blocksuite/global/lit';
-import {
-  type BlockStdScope,
-  PropTypes,
-  requiredProperties,
-  ShadowlessElement,
-  stdContext,
-} from '@blocksuite/std';
-import { consume } from '@lit/context';
-import { css, type PropertyValues } from 'lit';
-import { property, state } from 'lit/decorators.js';
-import { html } from 'lit-html';
-import { isEqual } from 'lodash-es';
-
-@requiredProperties({
-  commentIds: PropTypes.arrayOf(id => typeof id === 'string'),
-})
-export class InlineComment extends WithDisposable(ShadowlessElement) {
-  static override styles = css`
-    inline-comment {
-      display: inline;
-    }
-
-    inline-comment.unresolved {
-      background-color: ${unsafeCSSVarV2('block/comment/highlightDefault')};
-      border-bottom: 2px solid
-        ${unsafeCSSVarV2('block/comment/highlightUnderline')};
-    }
-
-    inline-comment.highlighted {
-      background-color: ${unsafeCSSVarV2('block/comment/highlightActive')};
-    }
-  `;
-
-  @property({
-    attribute: false,
-    hasChanged: (newVal: string[], oldVal: string[]) =>
-      !isEqual(newVal, oldVal),
-  })
-  accessor commentIds!: string[];
-
-  @property({ attribute: false })
-  accessor unresolved = false;
-
-  private _index: number = 0;
-
-  @consume({ context: stdContext })
-  private accessor _std!: BlockStdScope;
-
-  @state()
-  accessor highlighted = false;
-
-  private get _provider() {
-    return this._std.getOptional(CommentProviderIdentifier);
-  }
-
-  private readonly _handleClick = () => {
-    if (this.unresolved) {
-      this._provider?.highlightComment(this.commentIds[this._index]);
-      this._index = (this._index + 1) % this.commentIds.length;
-    }
-  };
-
-  private readonly _handleHighlight = (id: CommentId | null) => {
-    if (this.highlighted) {
-      if (!id || !this.commentIds.includes(id)) {
-        this.highlighted = false;
-      }
-    } else {
-      if (id && this.commentIds.includes(id)) {
-        this.highlighted = true;
-      }
-    }
-  };
-
-  override connectedCallback() {
-    super.connectedCallback();
-    const provider = this._provider;
-    if (provider) {
-      this.disposables.addFromEvent(this, 'click', this._handleClick);
-      this.disposables.add(
-        provider.onCommentHighlighted(this._handleHighlight)
-      );
-    }
-  }
-
-  override willUpdate(_changedProperties: PropertyValues<this>) {
-    if (_changedProperties.has('highlighted')) {
-      if (this.highlighted) {
-        this.classList.add('highlighted');
-      } else {
-        this.classList.remove('highlighted');
-      }
-    }
-    if (_changedProperties.has('unresolved')) {
-      if (this.unresolved) {
-        this.classList.add('unresolved');
-      } else {
-        this.classList.remove('unresolved');
-      }
-    }
-  }
-
-  override render() {
-    return html`<slot></slot>`;
-  }
-}

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

@@ -1,59 +0,0 @@
-import { type CommentId } from '@blocksuite/affine-shared/services';
-import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
-import { dynamicSchema, InlineSpecExtension } from '@blocksuite/std/inline';
-import { html, nothing } from 'lit-html';
-import { when } from 'lit-html/directives/when.js';
-import { z } from 'zod';
-
-import { extractCommentIdFromDelta } from './utils';
-
-type InlineCommendId = `comment-${CommentId}`;
-function isInlineCommendId(key: string): key is InlineCommendId {
-  return key.startsWith('comment-');
-}
-
-export const CommentInlineSpecExtension =
-  InlineSpecExtension<AffineTextAttributes>({
-    name: 'comment',
-    schema: dynamicSchema(
-      isInlineCommendId,
-      z.boolean().optional().nullable().catch(undefined)
-    ),
-    match: delta => {
-      if (!delta.attributes) return false;
-      const comments = Object.keys(delta.attributes).filter(isInlineCommendId);
-      return comments.length > 0;
-    },
-    renderer: ({ delta, children }) => {
-      if (!delta.attributes) return html`${nothing}`;
-
-      const unresolved = Object.entries(delta.attributes).some(
-        ([key, value]) => isInlineCommendId(key) && value === true
-      );
-      return html`<inline-comment
-        .unresolved=${unresolved}
-        .commentIds=${extractCommentIdFromDelta(delta)}
-        >${when(
-          children,
-          () => html`${children}`,
-          () => nothing
-        )}</inline-comment
-      >`;
-    },
-    wrapper: true,
-  });
-
-export const NullCommentInlineSpecExtension =
-  InlineSpecExtension<AffineTextAttributes>({
-    name: 'comment',
-    schema: dynamicSchema(
-      isInlineCommendId,
-      z.boolean().optional().nullable().catch(undefined)
-    ),
-    match: () => false,
-    renderer: () => html``,
-  });
-
-// reuse the same identifier
-NullCommentInlineSpecExtension.identifier =
-  CommentInlineSpecExtension.identifier;

blocksuite/affine/inlines/comment/src/utils.ts

@@ -1,64 +0,0 @@
-import type { CommentId } from '@blocksuite/affine-shared/services';
-import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
-import { TextSelection } from '@blocksuite/std';
-import type { DeltaInsert, Store } from '@blocksuite/store';
-
-export function findAllCommentedTexts(
-  store: Store
-): Map<TextSelection, CommentId> {
-  const result = new Map<TextSelection, CommentId>();
-
-  store.getAllModels().forEach(model => {
-    if (!model.text) return;
-
-    let index = 0;
-    model.text.toDelta().forEach(delta => {
-      if (!delta.insert) return;
-
-      const length = delta.insert.length;
-
-      if (!delta.attributes) {
-        index += length;
-        return;
-      }
-
-      Object.keys(delta.attributes)
-        .filter(key => key.startsWith('comment-'))
-        .forEach(key => {
-          const commentId = key.replace('comment-', '');
-          const selection = new TextSelection({
-            from: {
-              blockId: model.id,
-              index,
-              length,
-            },
-            to: null,
-          });
-          result.set(selection, commentId);
-        });
-
-      index += length;
-    });
-  });
-
-  return result;
-}
-
-export function findCommentedTexts(
-  store: Store,
-  commentId: CommentId
-): TextSelection[] {
-  return [...findAllCommentedTexts(store).entries()]
-    .filter(([_, id]) => id === commentId)
-    .map(([selection]) => selection);
-}
-
-export function extractCommentIdFromDelta(
-  delta: DeltaInsert<AffineTextAttributes>
-) {
-  if (!delta.attributes) return [];
-
-  return Object.keys(delta.attributes)
-    .filter(key => key.startsWith('comment-'))
-    .map(key => key.replace('comment-', ''));
-}

blocksuite/affine/inlines/comment/src/view.ts

@@ -1,42 +0,0 @@
-import {
-  type ViewExtensionContext,
-  ViewExtensionProvider,
-} from '@blocksuite/affine-ext-loader';
-import z from 'zod';
-
-import { effects } from './effects';
-import { InlineCommentManager } from './inline-comment-manager';
-import {
-  CommentInlineSpecExtension,
-  NullCommentInlineSpecExtension,
-} from './inline-spec';
-
-const optionsSchema = z.object({
-  enabled: z.boolean().optional().default(true),
-});
-
-export class InlineCommentViewExtension extends ViewExtensionProvider<
-  z.infer<typeof optionsSchema>
-> {
-  override name = 'affine-inline-comment';
-
-  override schema = optionsSchema;
-
-  override effect(): void {
-    super.effect();
-    effects();
-  }
-
-  override setup(
-    context: ViewExtensionContext,
-    options?: z.infer<typeof optionsSchema>
-  ) {
-    super.setup(context, options);
-    context.register([
-      options?.enabled
-        ? CommentInlineSpecExtension
-        : NullCommentInlineSpecExtension,
-      InlineCommentManager,
-    ]);
-  }
-}

blocksuite/affine/inlines/comment/tsconfig.json

@@ -1,18 +0,0 @@
-{
-  "extends": "../../../tsconfig.json",
-  "compilerOptions": {
-    "rootDir": "./src",
-    "outDir": "./dist",
-    "tsBuildInfoFile": "./dist/tsconfig.tsbuildinfo"
-  },
-  "include": ["./src"],
-  "references": [
-    { "path": "../../ext-loader" },
-    { "path": "../../model" },
-    { "path": "../../rich-text" },
-    { "path": "../../shared" },
-    { "path": "../../../framework/global" },
-    { "path": "../../../framework/std" },
-    { "path": "../../../framework/store" }
-  ]
-}

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

@@ -3,7 +3,6 @@ import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
 import { StdIdentifier } from '@blocksuite/std';
 import { InlineSpecExtension } from '@blocksuite/std/inline';
 import { html } from 'lit';
-import z from 'zod';
 
 import { FootNoteNodeConfigIdentifier } from './footnote-node/footnote-config';
 
@@ -14,9 +13,7 @@ export const FootNoteInlineSpecExtension =
       provider.getOptional(FootNoteNodeConfigIdentifier) ?? undefined;
     return {
       name: 'footnote',
-      schema: z.object({
-        footnote: FootNoteSchema.optional().nullable().catch(undefined),
-      }),
+      schema: FootNoteSchema.optional().nullable().catch(undefined),
       match: delta => {
         return !!delta.attributes?.footnote;
       },

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

@@ -9,9 +9,7 @@ export const LatexInlineSpecExtension =
     const std = provider.get(StdIdentifier);
     return {
       name: 'latex',
-      schema: z.object({
-        latex: z.string().optional().nullable().catch(undefined),
-      }),
+      schema: z.string().optional().nullable().catch(undefined),
       match: delta => typeof delta.attributes?.latex === 'string',
       renderer: ({ delta, selected, editor, startOffset, endOffset }) => {
         return html`<affine-latex-node
@@ -30,9 +28,7 @@ export const LatexInlineSpecExtension =
 export const LatexEditorUnitSpecExtension =
   InlineSpecExtension<AffineTextAttributes>({
     name: 'latex-editor-unit',
-    schema: z.object({
-      'latex-editor-unit': z.undefined(),
-    }),
+    schema: z.undefined(),
     match: () => true,
     renderer: ({ delta }) => {
       return html`<latex-editor-unit .delta=${delta}></latex-editor-unit>`;

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

@@ -190,7 +190,7 @@ export class AffineLatexNode extends SignalWatcher(
 
     blockComponent.selection.setGroup('note', []);
 
-    const { portal } = createLitPortal({
+    const portal = createLitPortal({
       template: html`<latex-editor-menu
         .std=${this.std}
         .latexSignal=${this.latexEditorSignal}

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

@@ -9,9 +9,7 @@ export const LinkInlineSpecExtension =
     const std = provider.get(StdIdentifier);
     return {
       name: 'link',
-      schema: z.object({
-        link: z.string().optional().nullable().catch(undefined),
-      }),
+      schema: z.string().optional().nullable().catch(undefined),
       match: delta => {
         return !!delta.attributes?.link;
       },

blocksuite/affine/inlines/mention/src/affine-mention.ts

@@ -23,7 +23,7 @@ export class AffineMention extends SignalWatcher(
         'clig' off;
       /* Client/baseMedium */
       font-family: Inter;
-      font-size: var(--affine-font-size-base);
+      font-size: 15px;
       font-style: normal;
       font-weight: 500;
       line-height: 24px; /* 160% */

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

@@ -9,16 +9,14 @@ export const MentionInlineSpecExtension =
     const std = provider.get(StdIdentifier);
     return {
       name: 'mention',
-      schema: z.object({
-        mention: z
-          .object({
-            member: z.string(),
-            notification: z.string().optional(),
-          })
-          .optional()
-          .nullable()
-          .catch(undefined),
-      }),
+      schema: z
+        .object({
+          member: z.string(),
+          notification: z.string().optional(),
+        })
+        .optional()
+        .nullable()
+        .catch(undefined),
       match: delta => {
         return !!delta.attributes?.mention?.member;
       },

blocksuite/affine/inlines/preset/package.json

@@ -12,7 +12,6 @@
   "dependencies": {
     "@blocksuite/affine-components": "workspace:*",
     "@blocksuite/affine-ext-loader": "workspace:*",
-    "@blocksuite/affine-inline-comment": "workspace:*",
     "@blocksuite/affine-inline-footnote": "workspace:*",
     "@blocksuite/affine-inline-latex": "workspace:*",
     "@blocksuite/affine-inline-link": "workspace:*",

blocksuite/affine/inlines/preset/src/command/config.ts

@@ -11,7 +11,7 @@ import { type EditorHost, TextSelection } from '@blocksuite/std';
 import type { TemplateResult } from 'lit';
 
 import {
-  isTextAttributeActive,
+  isTextStyleActive,
   toggleBold,
   toggleCode,
   toggleItalic,
@@ -38,7 +38,7 @@ export const textFormatConfigs: TextFormatConfig[] = [
     activeWhen: host => {
       const [result] = host.std.command
         .chain()
-        .pipe(isTextAttributeActive, { key: 'bold' })
+        .pipe(isTextStyleActive, { key: 'bold' })
         .run();
       return result;
     },
@@ -54,7 +54,7 @@ export const textFormatConfigs: TextFormatConfig[] = [
     activeWhen: host => {
       const [result] = host.std.command
         .chain()
-        .pipe(isTextAttributeActive, { key: 'italic' })
+        .pipe(isTextStyleActive, { key: 'italic' })
         .run();
       return result;
     },
@@ -70,7 +70,7 @@ export const textFormatConfigs: TextFormatConfig[] = [
     activeWhen: host => {
       const [result] = host.std.command
         .chain()
-        .pipe(isTextAttributeActive, { key: 'underline' })
+        .pipe(isTextStyleActive, { key: 'underline' })
         .run();
       return result;
     },
@@ -86,7 +86,7 @@ export const textFormatConfigs: TextFormatConfig[] = [
     activeWhen: host => {
       const [result] = host.std.command
         .chain()
-        .pipe(isTextAttributeActive, { key: 'strike' })
+        .pipe(isTextStyleActive, { key: 'strike' })
         .run();
       return result;
     },
@@ -102,7 +102,7 @@ export const textFormatConfigs: TextFormatConfig[] = [
     activeWhen: host => {
       const [result] = host.std.command
         .chain()
-        .pipe(isTextAttributeActive, { key: 'code' })
+        .pipe(isTextStyleActive, { key: 'code' })
         .run();
       return result;
     },
@@ -118,7 +118,7 @@ export const textFormatConfigs: TextFormatConfig[] = [
     activeWhen: host => {
       const [result] = host.std.command
         .chain()
-        .pipe(isTextAttributeActive, { key: 'link' })
+        .pipe(isTextStyleActive, { key: 'link' })
         .run();
       return result;
     },

blocksuite/affine/inlines/preset/src/command/format-text.ts

@@ -1,9 +1,6 @@
 import { clearMarksOnDiscontinuousInput } from '@blocksuite/affine-rich-text';
 import { getSelectedBlocksCommand } from '@blocksuite/affine-shared/commands';
-import type {
-  AffineTextAttributes,
-  AffineTextStyleAttributes,
-} from '@blocksuite/affine-shared/types';
+import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
 import type { Command, TextSelection } from '@blocksuite/std';
 import {
   INLINE_ROOT_ATTR,
@@ -16,7 +13,7 @@ import { FORMAT_TEXT_SUPPORT_FLAVOURS } from './consts.js';
 export const formatTextCommand: Command<{
   currentTextSelection?: TextSelection;
   textSelection?: TextSelection;
-  styles: AffineTextStyleAttributes;
+  styles: AffineTextAttributes;
   mode?: 'replace' | 'merge';
 }> = (ctx, next) => {
   const { styles, mode = 'merge' } = ctx;

blocksuite/affine/inlines/preset/src/command/index.ts

@@ -10,8 +10,8 @@ export { formatBlockCommand } from './format-block.js';
 export { formatNativeCommand } from './format-native.js';
 export { formatTextCommand } from './format-text.js';
 export {
-  getTextAttributes,
-  isTextAttributeActive,
+  getTextStyle,
+  isTextStyleActive,
   toggleBold,
   toggleCode,
   toggleItalic,

blocksuite/affine/inlines/preset/src/command/text-style.ts

@@ -2,31 +2,25 @@ import {
   getBlockSelectionsCommand,
   getTextSelectionCommand,
 } from '@blocksuite/affine-shared/commands';
-import type {
-  AffineTextAttributes,
-  AffineTextStyleAttributes,
-} from '@blocksuite/affine-shared/types';
+import type { AffineTextAttributes } from '@blocksuite/affine-shared/types';
 import type { Command } from '@blocksuite/std';
 
 import { formatBlockCommand } from './format-block.js';
 import { formatNativeCommand } from './format-native.js';
 import { formatTextCommand } from './format-text.js';
-import { getCombinedTextAttributes } from './utils.js';
+import { getCombinedTextStyle } from './utils.js';
 
 export const toggleTextStyleCommand: Command<{
   key: Extract<
-    keyof AffineTextStyleAttributes,
+    keyof AffineTextAttributes,
     'bold' | 'italic' | 'underline' | 'strike' | 'code'
   >;
 }> = (ctx, next) => {
   const { std, key } = ctx;
-  const [active] = std.command
-    .chain()
-    .pipe(isTextAttributeActive, { key })
-    .run();
+  const [active] = std.command.chain().pipe(isTextStyleActive, { key }).run();
 
   const payload: {
-    styles: AffineTextStyleAttributes;
+    styles: AffineTextAttributes;
     mode?: 'replace' | 'merge';
   } = {
     styles: {
@@ -52,7 +46,7 @@ export const toggleTextStyleCommand: Command<{
 
 const toggleTextStyleCommandWrapper = (
   key: Extract<
-    keyof AffineTextStyleAttributes,
+    keyof AffineTextAttributes,
     'bold' | 'italic' | 'underline' | 'strike' | 'code'
   >
 ): Command => {
@@ -72,29 +66,30 @@ export const toggleUnderline = toggleTextStyleCommandWrapper('underline');
 export const toggleStrike = toggleTextStyleCommandWrapper('strike');
 export const toggleCode = toggleTextStyleCommandWrapper('code');
 
-export const getTextAttributes: Command<
-  {},
-  { textAttributes: AffineTextAttributes }
-> = (ctx, next) => {
-  const [result, innerCtx] = getCombinedTextAttributes(
+export const getTextStyle: Command<{}, { textStyle: AffineTextAttributes }> = (
+  ctx,
+  next
+) => {
+  const [result, innerCtx] = getCombinedTextStyle(
     ctx.std.command.chain()
   ).run();
   if (!result) {
     return false;
   }
 
-  return next({ textAttributes: innerCtx.textAttributes });
+  return next({ textStyle: innerCtx.textStyle });
 };
 
-export const isTextAttributeActive: Command<{
-  key: keyof AffineTextAttributes;
-}> = (ctx, next) => {
+export const isTextStyleActive: Command<{ key: keyof AffineTextAttributes }> = (
+  ctx,
+  next
+) => {
   const key = ctx.key;
-  const [result] = getCombinedTextAttributes(ctx.std.command.chain())
+  const [result] = getCombinedTextStyle(ctx.std.command.chain())
     .pipe((ctx, next) => {
-      const { textAttributes } = ctx;
+      const { textStyle } = ctx;
 
-      if (textAttributes && key in textAttributes) {
+      if (textStyle && key in textStyle) {
         return next();
       }
 

blocksuite/affine/inlines/preset/src/command/utils.ts

@@ -77,8 +77,8 @@ function handleCurrentSelection(
   handler: (
     type: 'text' | 'block' | 'native',
     inlineEditors: InlineEditor<AffineTextAttributes>[]
-  ) => { textAttributes: AffineTextAttributes } | boolean | void
-): Chain<InitCommandCtx & { textAttributes: AffineTextAttributes }> {
+  ) => { textStyle: AffineTextAttributes } | boolean | void
+): Chain<InitCommandCtx & { textStyle: AffineTextAttributes }> {
   return chain.try(chain => [
     // text selection, corresponding to `formatText` command
     chain
@@ -174,25 +174,25 @@ function handleCurrentSelection(
   ]);
 }
 
-export function getCombinedTextAttributes(chain: Chain<InitCommandCtx>) {
+export function getCombinedTextStyle(chain: Chain<InitCommandCtx>) {
   return handleCurrentSelection(chain, (type, inlineEditors) => {
     if (type === 'text') {
       return {
-        textAttributes: getCombinedFormatFromInlineEditors(
+        textStyle: getCombinedFormatFromInlineEditors(
           inlineEditors.map(e => [e, e.getInlineRange()])
         ),
       };
     }
     if (type === 'block') {
       return {
-        textAttributes: getCombinedFormatFromInlineEditors(
+        textStyle: getCombinedFormatFromInlineEditors(
           inlineEditors.map(e => [e, { index: 0, length: e.yTextLength }])
         ),
       };
     }
     if (type === 'native') {
       return {
-        textAttributes: getCombinedFormatFromInlineEditors(
+        textStyle: getCombinedFormatFromInlineEditors(
           inlineEditors.map(e => [e, e.getInlineRange()])
         ),
       };

blocksuite/affine/inlines/preset/src/default-inline-manager.ts

@@ -1,4 +1,3 @@
-import { CommentInlineSpecExtension } from '@blocksuite/affine-inline-comment';
 import { FootNoteInlineSpecExtension } from '@blocksuite/affine-inline-footnote';
 import { LatexInlineSpecExtension } from '@blocksuite/affine-inline-latex';
 import { LinkInlineSpecExtension } from '@blocksuite/affine-inline-link';
@@ -33,6 +32,5 @@ export const DefaultInlineManagerExtension =
       LinkInlineSpecExtension.identifier,
       FootNoteInlineSpecExtension.identifier,
       MentionInlineSpecExtension.identifier,
-      CommentInlineSpecExtension.identifier,
     ],
   });

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

@@ -12,9 +12,7 @@ export type AffineInlineRootElement = InlineRootElement<AffineTextAttributes>;
 export const BoldInlineSpecExtension =
   InlineSpecExtension<AffineTextAttributes>({
     name: 'bold',
-    schema: z.object({
-      bold: z.literal(true).optional().nullable().catch(undefined),
-    }),
+    schema: z.literal(true).optional().nullable().catch(undefined),
     match: delta => {
       return !!delta.attributes?.bold;
     },
@@ -26,9 +24,7 @@ export const BoldInlineSpecExtension =
 export const ItalicInlineSpecExtension =
   InlineSpecExtension<AffineTextAttributes>({
     name: 'italic',
-    schema: z.object({
-      italic: z.literal(true).optional().nullable().catch(undefined),
-    }),
+    schema: z.literal(true).optional().nullable().catch(undefined),
     match: delta => {
       return !!delta.attributes?.italic;
     },
@@ -40,9 +36,7 @@ export const ItalicInlineSpecExtension =
 export const UnderlineInlineSpecExtension =
   InlineSpecExtension<AffineTextAttributes>({
     name: 'underline',
-    schema: z.object({
-      underline: z.literal(true).optional().nullable().catch(undefined),
-    }),
+    schema: z.literal(true).optional().nullable().catch(undefined),
     match: delta => {
       return !!delta.attributes?.underline;
     },
@@ -54,9 +48,7 @@ export const UnderlineInlineSpecExtension =
 export const StrikeInlineSpecExtension =
   InlineSpecExtension<AffineTextAttributes>({
     name: 'strike',
-    schema: z.object({
-      strike: z.literal(true).optional().nullable().catch(undefined),
-    }),
+    schema: z.literal(true).optional().nullable().catch(undefined),
     match: delta => {
       return !!delta.attributes?.strike;
     },
@@ -68,9 +60,7 @@ export const StrikeInlineSpecExtension =
 export const CodeInlineSpecExtension =
   InlineSpecExtension<AffineTextAttributes>({
     name: 'inline-code',
-    schema: z.object({
-      code: z.literal(true).optional().nullable().catch(undefined),
-    }),
+    schema: z.literal(true).optional().nullable().catch(undefined),
     match: delta => {
       return !!delta.attributes?.code;
     },
@@ -82,9 +72,7 @@ export const CodeInlineSpecExtension =
 export const BackgroundInlineSpecExtension =
   InlineSpecExtension<AffineTextAttributes>({
     name: 'background',
-    schema: z.object({
-      background: z.string().optional().nullable().catch(undefined),
-    }),
+    schema: z.string().optional().nullable().catch(undefined),
     match: delta => {
       return !!delta.attributes?.background;
     },
@@ -96,9 +84,7 @@ export const BackgroundInlineSpecExtension =
 export const ColorInlineSpecExtension =
   InlineSpecExtension<AffineTextAttributes>({
     name: 'color',
-    schema: z.object({
-      color: z.string().optional().nullable().catch(undefined),
-    }),
+    schema: z.string().optional().nullable().catch(undefined),
     match: delta => {
       return !!delta.attributes?.color;
     },