feat(core): block diff ui

.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

@@ -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/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/release-mobile.yml

@@ -124,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

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",
@@ -285,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/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/package.json

@@ -23,7 +23,7 @@
     "@floating-ui/dom": "^1.6.13",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "file-type": "^21.0.0",
     "lit": "^3.2.0",
     "minimatch": "^10.0.1",

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

@@ -17,7 +17,6 @@ import {
   AttachmentBlockStyles,
 } from '@blocksuite/affine-model';
 import {
-  BlockCommentManager,
   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(BlockCommentManager)
-        ?.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/configs/toolbar.ts

@@ -10,7 +10,6 @@ import {
 } from '@blocksuite/affine-shared/consts';
 import {
   ActionPlacement,
-  blockCommentToolbarButton,
   type ToolbarAction,
   type ToolbarActionGroup,
   type ToolbarModuleConfig,
@@ -241,10 +240,6 @@ const builtinToolbarConfig = {
     replaceAction,
     downloadAction,
     captionAction,
-    {
-      id: 'f.comment',
-      ...blockCommentToolbarButton,
-    },
     {
       placement: ActionPlacement.More,
       id: 'a.clipboard',

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/package.json

@@ -24,7 +24,7 @@
     "@blocksuite/store": "workspace:*",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "lit": "^3.2.0",
     "minimatch": "^10.0.1",
     "rxjs": "^7.8.1",

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

@@ -8,7 +8,6 @@ import type {
 } from '@blocksuite/affine-model';
 import { ImageProxyService } from '@blocksuite/affine-shared/adapters';
 import {
-  BlockCommentManager,
   CitationProvider,
   DocModeProvider,
   LinkPreviewServiceIdentifier,
@@ -129,14 +128,6 @@ export class BookmarkBlockComponent extends CaptionedBlockComponent<BookmarkBloc
     return this.std.get(ImageProxyService);
   }
 
-  get isCommentHighlighted() {
-    return (
-      this.std
-        .getOptional(BlockCommentManager)
-        ?.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/configs/toolbar.ts

@@ -17,7 +17,6 @@ import {
 } from '@blocksuite/affine-shared/consts';
 import {
   ActionPlacement,
-  blockCommentToolbarButton,
   EmbedIframeService,
   EmbedOptionProvider,
   type LinkEventType,
@@ -289,10 +288,6 @@ const builtinToolbarConfig = {
       },
     } satisfies ToolbarActionGroup<ToolbarAction>,
     captionAction,
-    {
-      id: 'e.comment',
-      ...blockCommentToolbarButton,
-    },
     {
       placement: ActionPlacement.More,
       id: 'a.clipboard',

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';
 
@@ -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/callout/package.json

@@ -25,7 +25,7 @@
     "@floating-ui/dom": "^1.6.10",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "@types/mdast": "^4.0.4",
     "emoji-mart": "^5.6.0",
     "lit": "^3.2.0",

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:*",
@@ -28,7 +27,7 @@
     "@floating-ui/dom": "^1.6.13",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "@types/mdast": "^4.0.4",
     "lit": "^3.2.0",
     "minimatch": "^10.0.1",

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.ts

@@ -6,7 +6,6 @@ import {
   EDGELESS_TOP_CONTENTEDITABLE_SELECTOR,
 } from '@blocksuite/affine-shared/consts';
 import {
-  BlockCommentManager,
   DocModeProvider,
   NotificationProvider,
 } from '@blocksuite/affine-shared/services';
@@ -391,14 +390,6 @@ export class CodeBlockComponent extends CaptionedBlockComponent<CodeBlockModel>
       });
   }
 
-  get isCommentHighlighted() {
-    return (
-      this.std
-        .getOptional(BlockCommentManager)
-        ?.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/package.json

@@ -24,7 +24,7 @@
     "@floating-ui/dom": "^1.6.13",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "@types/mdast": "^4.0.4",
     "lit": "^3.2.0",
     "minimatch": "^10.0.1",

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

@@ -42,6 +42,7 @@ import { computed, signal } from '@preact/signals-core';
 import { css, nothing, unsafeCSS } from 'lit';
 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';
 
@@ -303,9 +304,16 @@ export class DataViewBlockComponent extends CaptionedBlockComponent<DataViewBloc
     },
   });
   override renderBlock() {
+    const widgets = html`${repeat(
+      Object.entries(this.widgets),
+      ([id]) => id,
+      ([_, widget]) => widget
+    )}`;
+
     return html`
       <div contenteditable="false" style="position: relative">
         ${this.dataViewRootLogic.render()}
+        ${widgets}
       </div>
     `;
   }

blocksuite/affine/blocks/database/package.json

@@ -28,7 +28,7 @@
     "@floating-ui/dom": "^1.6.13",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "@types/mdast": "^4.0.4",
     "date-fns": "^4.0.0",
     "lit": "^3.2.0",

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 {
-  BlockCommentManager,
-  CommentProviderIdentifier,
   DocModeProvider,
   NotificationProvider,
   type TelemetryEventMap,
@@ -36,18 +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 { popSideDetail } from './components/layout.js';
 import { DatabaseConfigExtension } from './config.js';
 import { EditorHostKey } from './context/host-context.js';
@@ -85,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',
@@ -312,14 +298,6 @@ export class DatabaseBlockComponent extends CaptionedBlockComponent<DatabaseBloc
     };
   }
 
-  get isCommentHighlighted() {
-    return (
-      this.std
-        .getOptional(BlockCommentManager)
-        ?.isBlockCommentHighlighted(this.model) ?? false
-    );
-  }
-
   override get topContenteditableElement() {
     if (this.std.get(DocModeProvider).getEditorMode() === 'edgeless') {
       return this.closest<BlockComponent>(
@@ -451,9 +429,15 @@ export class DatabaseBlockComponent extends CaptionedBlockComponent<DatabaseBloc
       })
   );
   override renderBlock() {
+    const widgets = html`${repeat(
+      Object.entries(this.widgets),
+      ([id]) => id,
+      ([_, widget]) => widget
+    )}`;
+
     return html`
       <div contenteditable="false" class="${databaseContentStyles}">
-        ${this.dataViewRootLogic.value.render()}
+        ${this.dataViewRootLogic.value.render()} ${widgets}
       </div>
     `;
   }

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/divider/package.json

@@ -21,7 +21,7 @@
     "@floating-ui/dom": "^1.6.13",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "@types/mdast": "^4.0.4",
     "lit": "^3.2.0",
     "minimatch": "^10.0.1",

blocksuite/affine/blocks/edgeless-text/package.json

@@ -26,7 +26,7 @@
     "@floating-ui/dom": "^1.6.13",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "lit": "^3.2.0",
     "minimatch": "^10.0.1",
     "rxjs": "^7.8.1",

blocksuite/affine/blocks/embed-doc/package.json

@@ -26,7 +26,7 @@
     "@floating-ui/dom": "^1.6.13",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "@types/lodash-es": "^4.17.12",
     "lit": "^3.2.0",
     "lodash-es": "^4.17.21",

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

@@ -11,7 +11,6 @@ import {
 } from '@blocksuite/affine-shared/consts';
 import {
   ActionPlacement,
-  blockCommentToolbarButton,
   DocDisplayMetaProvider,
   EditorSettingProvider,
   type LinkEventType,
@@ -306,10 +305,6 @@ const builtinToolbarConfig = {
       },
     } satisfies ToolbarActionGroup<ToolbarAction>,
     captionAction,
-    {
-      id: 'e.comment',
-      ...blockCommentToolbarButton,
-    },
     {
       placement: ActionPlacement.More,
       id: 'a.clipboard',

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

@@ -15,10 +15,6 @@ export const styles = css`
     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/configs/toolbar.ts

@@ -16,7 +16,6 @@ import {
 import { REFERENCE_NODE } from '@blocksuite/affine-shared/consts';
 import {
   ActionPlacement,
-  blockCommentToolbarButton,
   EditorSettingProvider,
   type LinkEventType,
   type OpenDocMode,
@@ -226,10 +225,6 @@ const builtinToolbarConfig = {
     openDocActionGroup,
     conversionsActionGroup,
     captionAction,
-    {
-      id: 'e.comment',
-      ...blockCommentToolbarButton,
-    },
     {
       placement: ActionPlacement.More,
       id: 'a.clipboard',

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);
   }

blocksuite/affine/blocks/embed/package.json

@@ -26,7 +26,7 @@
     "@floating-ui/dom": "^1.6.13",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "@types/lodash-es": "^4.17.12",
     "lit": "^3.2.0",
     "lodash-es": "^4.17.21",

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 {
-  BlockCommentManager,
-  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(BlockCommentManager)
-        ?.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/configs/toolbar.ts

@@ -13,7 +13,6 @@ import {
 } from '@blocksuite/affine-shared/consts';
 import {
   ActionPlacement,
-  blockCommentToolbarButton,
   EmbedOptionProvider,
   type LinkEventType,
   type ToolbarAction,
@@ -349,10 +348,6 @@ function createBuiltinToolbarConfigForExternal(
           });
         },
       },
-      {
-        id: 'e.comment',
-        ...blockCommentToolbarButton,
-      },
       {
         placement: ActionPlacement.More,
         id: 'a.clipboard',

blocksuite/affine/blocks/frame/package.json

@@ -25,7 +25,7 @@
     "@floating-ui/dom": "^1.6.13",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "@types/mdast": "^4.0.4",
     "lit": "^3.2.0",
     "minimatch": "^10.0.1",

blocksuite/affine/blocks/image/package.json

@@ -25,7 +25,7 @@
     "@floating-ui/dom": "^1.6.13",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "file-type": "^21.0.0",
     "lit": "^3.2.0",
     "minimatch": "^10.0.1",

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/configs/toolbar.ts

@@ -1,7 +1,6 @@
 import { ImageBlockModel } from '@blocksuite/affine-model';
 import {
   ActionPlacement,
-  blockCommentToolbarButton,
   type ToolbarModuleConfig,
   ToolbarModuleExtension,
 } from '@blocksuite/affine-shared/services';
@@ -50,10 +49,6 @@ const builtinToolbarConfig = {
         });
       },
     },
-    {
-      id: 'c.comment',
-      ...blockCommentToolbarButton,
-    },
     {
       placement: ActionPlacement.More,
       id: 'a.clipboard',
@@ -146,10 +141,6 @@ const builtinSurfaceToolbarConfig = {
         });
       },
     },
-    {
-      id: 'c.comment',
-      ...blockCommentToolbarButton,
-    },
   ],
 
   when: ctx => ctx.getSurfaceModelsByType(ImageBlockModel).length === 1,

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 {
-  BlockCommentManager,
-  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(BlockCommentManager)
-        ?.isBlockCommentHighlighted(this.model) ?? false
-    );
-  }
-
   private _handleClick(event: MouseEvent) {
     // the peek view need handle shift + click
     if (event.defaultPrevented) return;

blocksuite/affine/blocks/latex/package.json

@@ -25,7 +25,7 @@
     "@floating-ui/dom": "^1.6.13",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "@types/katex": "^0.16.7",
     "@types/mdast": "^4.0.4",
     "katex": "^0.16.11",

blocksuite/affine/blocks/list/package.json

@@ -24,7 +24,7 @@
     "@floating-ui/dom": "^1.6.13",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "@types/mdast": "^4.0.4",
     "lit": "^3.2.0",
     "minimatch": "^10.0.1",

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

@@ -23,6 +23,7 @@ import { effect } from '@preact/signals-core';
 import { html, nothing, type TemplateResult } from 'lit';
 import { query, state } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
+import { repeat } from 'lit/directives/repeat.js';
 import { styleMap } from 'lit/directives/style-map.js';
 
 import { correctNumberedListsOrderToPrev } from './commands/utils.js';
@@ -138,6 +139,11 @@ export class ListBlockComponent extends CaptionedBlockComponent<ListBlockModel>
 
   override renderBlock(): TemplateResult<1> {
     const { model, _onClickIcon } = this;
+    const widgets = html`${repeat(
+      Object.entries(this.widgets),
+      ([id]) => id,
+      ([_, widget]) => widget
+    )}`;
     const collapsed = this.store.readonly
       ? this._readonlyCollapsed
       : model.props.collapsed;
@@ -199,7 +205,7 @@ export class ListBlockComponent extends CaptionedBlockComponent<ListBlockModel>
           ></rich-text>
         </div>
 
-        ${children}
+        ${children} ${widgets}
       </div>
     `;
   }

blocksuite/affine/blocks/note/package.json

@@ -27,7 +27,7 @@
     "@blocksuite/store": "workspace:*",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "@types/lodash-es": "^4.17.12",
     "@types/mdast": "^4.0.4",
     "@vanilla-extract/css": "^1.17.0",

blocksuite/affine/blocks/paragraph/package.json

@@ -23,7 +23,7 @@
     "@floating-ui/dom": "^1.6.13",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "@types/mdast": "^4.0.4",
     "lit": "^3.2.0",
     "minimatch": "^10.0.1",

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

@@ -8,7 +8,6 @@ import {
   EDGELESS_TOP_CONTENTEDITABLE_SELECTOR,
 } from '@blocksuite/affine-shared/consts';
 import {
-  BlockCommentManager,
   CitationProvider,
   DocModeProvider,
 } from '@blocksuite/affine-shared/services';
@@ -27,6 +26,7 @@ import { computed, effect, signal } from '@preact/signals-core';
 import { html, nothing, type TemplateResult } from 'lit';
 import { query, state } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
+import { repeat } from 'lit/directives/repeat.js';
 import { styleMap } from 'lit/directives/style-map.js';
 import { unsafeHTML } from 'lit/directives/unsafe-html.js';
 
@@ -108,14 +108,6 @@ export class ParagraphBlockComponent extends CaptionedBlockComponent<ParagraphBl
     );
   }
 
-  get isCommentHighlighted() {
-    return (
-      this.std
-        .getOptional(BlockCommentManager)
-        ?.isBlockCommentHighlighted(this.model) ?? false
-    );
-  }
-
   override get topContenteditableElement() {
     if (this.std.get(DocModeProvider).getEditorMode() === 'edgeless') {
       return this.closest<BlockComponent>(
@@ -236,6 +228,12 @@ export class ParagraphBlockComponent extends CaptionedBlockComponent<ParagraphBl
   }
 
   override renderBlock(): TemplateResult<1> {
+    const widgets = html`${repeat(
+      Object.entries(this.widgets),
+      ([id]) => id,
+      ([_, widget]) => widget
+    )}`;
+
     const { type$ } = this.model.props;
     const collapsed = this.store.readonly
       ? this._readonlyCollapsed
@@ -277,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
@@ -352,7 +347,7 @@ export class ParagraphBlockComponent extends CaptionedBlockComponent<ParagraphBl
               `}
         </div>
 
-        ${children}
+        ${children} ${widgets}
       </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/package.json

@@ -44,7 +44,7 @@
     "@floating-ui/dom": "^1.6.13",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "@types/lodash-es": "^4.17.12",
     "dompurify": "^3.2.4",
     "html2canvas": "^1.4.1",

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/surface-ref/package.json

@@ -25,7 +25,7 @@
     "@floating-ui/dom": "^1.6.13",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "@types/lodash-es": "^4.17.12",
     "fractional-indexing": "^3.2.0",
     "lit": "^3.2.0",

blocksuite/affine/blocks/surface-ref/src/configs/toolbar.ts

@@ -5,7 +5,6 @@ import {
 } from '@blocksuite/affine-shared/commands';
 import {
   ActionPlacement,
-  blockCommentToolbarButton,
   type ToolbarModuleConfig,
 } from '@blocksuite/affine-shared/services';
 import { CaptionIcon, CopyIcon, DeleteIcon } from '@blocksuite/icons/lit';
@@ -62,10 +61,6 @@ export const surfaceRefToolbarModuleConfig: ToolbarModuleConfig = {
         surfaceRefBlock.captionElement.show();
       },
     },
-    {
-      id: 'e.comment',
-      ...blockCommentToolbarButton,
-    },
     {
       id: 'a.clipboard',
       placement: ActionPlacement.More,

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

@@ -13,7 +13,6 @@ import {
   type SurfaceRefBlockModel,
 } from '@blocksuite/affine-model';
 import {
-  BlockCommentManager,
   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(BlockCommentManager)
-        ?.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/blocks/surface/package.json

@@ -20,7 +20,7 @@
     "@blocksuite/store": "workspace:*",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "@types/lodash-es": "^4.17.12",
     "fractional-indexing": "^3.2.0",
     "html2canvas": "^1.4.1",

blocksuite/affine/components/package.json

@@ -21,7 +21,7 @@
     "@lit/context": "^1.1.2",
     "@lottiefiles/dotlottie-wc": "^0.5.0",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "@types/hast": "^3.0.4",
     "@types/katex": "^0.16.7",
     "@types/lodash-es": "^4.17.12",

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/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/data-view/package.json

@@ -21,7 +21,7 @@
     "@floating-ui/dom": "^1.6.13",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "@types/lodash-es": "^4.17.12",
     "clsx": "^2.1.1",
     "date-fns": "^4.0.0",

blocksuite/affine/foundation/package.json

@@ -22,7 +22,7 @@
     "@floating-ui/dom": "^1.6.13",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "@types/lodash-es": "^4.17.12",
     "lit": "^3.2.0",
     "lodash-es": "^4.17.21",
@@ -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,
-  BlockCommentManager,
   CitationService,
   DefaultOpenDocExtension,
   DNDAPIExtension,
@@ -79,7 +78,6 @@ export class FoundationViewExtension extends ViewExtensionProvider<FoundationVie
       LinkPreviewCache,
       LinkPreviewService,
       CitationService,
-      BlockCommentManager,
     ]);
     context.register(clipboardConfigs);
     if (this.isEdgeless(context.scope)) {

blocksuite/affine/fragments/adapter-panel/package.json

@@ -21,7 +21,7 @@
     "@floating-ui/dom": "^1.6.13",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "lit": "^3.2.0",
     "rxjs": "^7.8.1"
   },

blocksuite/affine/fragments/doc-title/package.json

@@ -24,7 +24,7 @@
     "@floating-ui/dom": "^1.6.13",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "lit": "^3.2.0",
     "minimatch": "^10.0.1",
     "rxjs": "^7.8.1",

blocksuite/affine/fragments/frame-panel/package.json

@@ -24,7 +24,7 @@
     "@floating-ui/dom": "^1.6.13",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "@types/lodash-es": "^4.17.12",
     "lit": "^3.2.0",
     "lodash-es": "^4.17.21",

blocksuite/affine/fragments/outline/package.json

@@ -24,7 +24,7 @@
     "@floating-ui/dom": "^1.6.13",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "@vanilla-extract/css": "^1.17.0",
     "lit": "^3.2.0",
     "minimatch": "^10.0.1",

blocksuite/affine/gfx/brush/package.json

@@ -23,7 +23,7 @@
     "@blocksuite/store": "workspace:*",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "@types/lodash-es": "^4.17.12",
     "lit": "^3.2.0",
     "lodash-es": "^4.17.21",

blocksuite/affine/gfx/connector/package.json

@@ -24,7 +24,7 @@
     "@blocksuite/store": "workspace:*",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "@types/lodash-es": "^4.17.12",
     "lit": "^3.2.0",
     "lodash-es": "^4.17.21",

blocksuite/affine/gfx/group/package.json

@@ -24,7 +24,7 @@
     "@blocksuite/store": "workspace:*",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "@types/lodash-es": "^4.17.12",
     "lit": "^3.2.0",
     "lodash-es": "^4.17.21",

blocksuite/affine/gfx/link/package.json

@@ -26,7 +26,7 @@
     "@blocksuite/store": "workspace:*",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "@types/lodash-es": "^4.17.12",
     "lit": "^3.2.0",
     "lodash-es": "^4.17.21",

blocksuite/affine/gfx/mindmap/package.json

@@ -30,7 +30,7 @@
     "@blocksuite/store": "workspace:*",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "@types/lodash-es": "^4.17.12",
     "lit": "^3.2.0",
     "lodash-es": "^4.17.21",

blocksuite/affine/gfx/note/package.json

@@ -26,7 +26,7 @@
     "@blocksuite/store": "workspace:*",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "@types/lodash-es": "^4.17.12",
     "lit": "^3.2.0",
     "lodash-es": "^4.17.21",

blocksuite/affine/gfx/pointer/package.json

@@ -23,7 +23,7 @@
     "@blocksuite/store": "workspace:*",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "@types/lodash-es": "^4.17.12",
     "lit": "^3.2.0",
     "lodash-es": "^4.17.21",

blocksuite/affine/gfx/shape/package.json

@@ -24,7 +24,7 @@
     "@blocksuite/store": "workspace:*",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "@types/lodash-es": "^4.17.12",
     "lit": "^3.2.0",
     "lodash-es": "^4.17.21",

blocksuite/affine/gfx/template/package.json

@@ -25,7 +25,7 @@
     "@floating-ui/dom": "^1.6.13",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "@types/lodash-es": "^4.17.12",
     "lit": "^3.2.0",
     "lodash-es": "^4.17.21",

blocksuite/affine/gfx/text/package.json

@@ -23,7 +23,7 @@
     "@blocksuite/store": "workspace:*",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "@types/lodash-es": "^4.17.12",
     "lit": "^3.2.0",
     "lodash-es": "^4.17.21",

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,2 +0,0 @@
-export * from './inline-spec';
-export * from './utils';

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

@@ -1,218 +0,0 @@
-import { getInlineEditorByModel } from '@blocksuite/affine-rich-text';
-import { getSelectedBlocksCommand } from '@blocksuite/affine-shared/commands';
-import {
-  BlockCommentManager,
-  type CommentId,
-  CommentProviderIdentifier,
-  findAllCommentedBlocks,
-} 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(this._handleDeleteAndResolve)
-    );
-    this._disposables.add(
-      provider.onCommentResolved(this._handleDeleteAndResolve)
-    );
-    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('unresolved');
-    const inlineComments = [...findAllCommentedTexts(this.std.store).values()];
-
-    const blockComments = findAllCommentedBlocks(this.std.store).flatMap(
-      block => Object.keys(block.props.comments)
-    );
-
-    const commentsInEditor = [
-      ...new Set([...inlineComments, ...blockComments]),
-    ];
-
-    // resolve comments that are in provider but not in editor
-    // which means the commented content may be deleted
-    difference(commentsInProvider, commentsInEditor).forEach(comment => {
-      provider.resolveComment(comment);
-    });
-
-    // 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._handleDeleteAndResolve(comment);
-      this.std.get(BlockCommentManager).handleDeleteAndResolve(comment);
-    });
-  }
-
-  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) => {
-    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}`]: null,
-          },
-          {
-            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,97 +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-block;
-      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[];
-
-  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 = () => {
-    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');
-      }
-    }
-  }
-
-  override render() {
-    return html`<slot></slot>`;
-  }
-}

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

@@ -1,38 +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.entries(delta.attributes).filter(
-        ([key, value]) => isInlineCommendId(key) && value === true
-      );
-      return comments.length > 0;
-    },
-    renderer: ({ delta, children }) =>
-      html`<inline-comment .commentIds=${extractCommentIdFromDelta(delta)}
-        >${when(
-          children,
-          () => html`${children}`,
-          () => nothing
-        )}</inline-comment
-      >`,
-    wrapper: true,
-  });

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,22 +0,0 @@
-import {
-  type ViewExtensionContext,
-  ViewExtensionProvider,
-} from '@blocksuite/affine-ext-loader';
-
-import { effects } from './effects';
-import { InlineCommentManager } from './inline-comment-manager';
-import { CommentInlineSpecExtension } from './inline-spec';
-
-export class InlineCommentViewExtension extends ViewExtensionProvider {
-  override name = 'affine-inline-comment';
-
-  override effect(): void {
-    super.effect();
-    effects();
-  }
-
-  override setup(context: ViewExtensionContext) {
-    super.setup(context);
-    context.register([CommentInlineSpecExtension, 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/package.json

@@ -22,7 +22,7 @@
     "@floating-ui/dom": "^1.6.13",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",
-    "@toeverything/theme": "^1.1.15",
+    "@toeverything/theme": "^1.1.16",
     "@types/lodash-es": "^4.17.12",
     "collapse-white-space": "^2.1.0",
     "date-fns": "^4.0.0",

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;
       },