chore: enable webview debugging for Android

.docker/selfhost/schema.json

@@ -148,11 +148,6 @@
           "description": "Whether allow new registrations.\n@default true",
           "default": true
         },
-        "allowSignupForOauth": {
-          "type": "boolean",
-          "description": "Whether allow new registrations via configured oauth.\n@default true",
-          "default": true
-        },
         "requireEmailDomainVerification": {
           "type": "boolean",
           "description": "Whether require email domain record verification before accessing restricted resources.\n@default false",
@@ -195,11 +190,6 @@
       "type": "object",
       "description": "Configuration for mailer module",
       "properties": {
-        "SMTP.name": {
-          "type": "string",
-          "description": "Name of the email server (e.g. your domain name)\n@default \"AFFiNE Server\"\n@environment `MAILER_SERVERNAME`",
-          "default": "AFFiNE Server"
-        },
         "SMTP.host": {
           "type": "string",
           "description": "Host of the email server (e.g. smtp.gmail.com)\n@default \"\"\n@environment `MAILER_HOST`",
@@ -235,11 +225,6 @@
           "description": "The emails from these domains are always sent using the fallback SMTP server.\n@default []",
           "default": []
         },
-        "fallbackSMTP.name": {
-          "type": "string",
-          "description": "Name of the fallback email server (e.g. your domain name)\n@default \"AFFiNE Server\"",
-          "default": "AFFiNE Server"
-        },
         "fallbackSMTP.host": {
           "type": "string",
           "description": "Host of the email server (e.g. smtp.gmail.com)\n@default \"\"",
@@ -684,16 +669,16 @@
         },
         "scenarios": {
           "type": "object",
-          "description": "Use custom models in scenarios and override default settings.\n@default {\"override_enabled\":false,\"scenarios\":{\"audio_transcribing\":\"gemini-2.5-flash\",\"chat\":\"gemini-2.5-flash\",\"embedding\":\"gemini-embedding-001\",\"image\":\"gpt-image-1\",\"rerank\":\"gpt-4.1\",\"coding\":\"claude-sonnet-4-5@20250929\",\"complex_text_generation\":\"gpt-4o-2024-08-06\",\"quick_decision_making\":\"gpt-5-mini\",\"quick_text_generation\":\"gemini-2.5-flash\",\"polish_and_summarize\":\"gemini-2.5-flash\"}}",
+          "description": "Use custom models in scenarios and override default settings.\n@default {\"override_enabled\":false,\"scenarios\":{\"audio_transcribing\":\"gemini-2.5-flash\",\"chat\":\"claude-sonnet-4@20250514\",\"embedding\":\"gemini-embedding-001\",\"image\":\"gpt-image-1\",\"rerank\":\"gpt-4.1\",\"coding\":\"claude-sonnet-4@20250514\",\"complex_text_generation\":\"gpt-4o-2024-08-06\",\"quick_decision_making\":\"gpt-5-mini\",\"quick_text_generation\":\"gemini-2.5-flash\",\"polish_and_summarize\":\"gemini-2.5-flash\"}}",
           "default": {
             "override_enabled": false,
             "scenarios": {
               "audio_transcribing": "gemini-2.5-flash",
-              "chat": "gemini-2.5-flash",
+              "chat": "claude-sonnet-4@20250514",
               "embedding": "gemini-embedding-001",
               "image": "gpt-image-1",
               "rerank": "gpt-4.1",
-              "coding": "claude-sonnet-4-5@20250929",
+              "coding": "claude-sonnet-4@20250514",
               "complex_text_generation": "gpt-4o-2024-08-06",
               "quick_decision_making": "gpt-5-mini",
               "quick_text_generation": "gemini-2.5-flash",
@@ -1108,33 +1093,18 @@
         },
         "apiKey": {
           "type": "string",
-          "description": "[Deprecated] Stripe API key. Use payment.stripe.apiKey instead.\n@default \"\"\n@environment `STRIPE_API_KEY`",
+          "description": "Stripe API key to enable payment service.\n@default \"\"\n@environment `STRIPE_API_KEY`",
           "default": ""
         },
         "webhookKey": {
           "type": "string",
-          "description": "[Deprecated] Stripe webhook key. Use payment.stripe.webhookKey instead.\n@default \"\"\n@environment `STRIPE_WEBHOOK_KEY`",
+          "description": "Stripe webhook key to enable payment service.\n@default \"\"\n@environment `STRIPE_WEBHOOK_KEY`",
           "default": ""
         },
         "stripe": {
           "type": "object",
-          "description": "Stripe sdk options and credentials\n@default {\"apiKey\":\"\",\"webhookKey\":\"\"}\n@link https://docs.stripe.com/api",
-          "default": {
-            "apiKey": "",
-            "webhookKey": ""
-          }
-        },
-        "revenuecat": {
-          "type": "object",
-          "description": "RevenueCat integration configs\n@default {\"enabled\":false,\"apiKey\":\"\",\"projectId\":\"\",\"webhookAuth\":\"\",\"environment\":\"production\",\"productMap\":{}}\n@link https://www.revenuecat.com/docs/",
-          "default": {
-            "enabled": false,
-            "apiKey": "",
-            "projectId": "",
-            "webhookAuth": "",
-            "environment": "production",
-            "productMap": {}
-          }
+          "description": "Stripe sdk options\n@default {}\n@link https://docs.stripe.com/api",
+          "default": {}
         }
       }
     },

Cargo.lock

@@ -161,7 +161,6 @@ dependencies = [
  "affine_common",
  "chrono",
  "file-format",
- "infer",
  "mimalloc",
  "napi",
  "napi-build",
@@ -1505,9 +1504,9 @@ dependencies = [
 
 [[package]]
 name = "file-format"
-version = "0.28.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eab8aa2fba5f39f494000a22f44bf3c755b7d7f8ffad3f36c6d507893074159"
+checksum = "e7ef3d5e8ae27277c8285ac43ed153158178ef0f79567f32024ca8140a0c7cd8"
 
 [[package]]
 name = "flate2"
@@ -1914,7 +1913,7 @@ dependencies = [
  "js-sys",
  "log",
  "wasm-bindgen",
- "windows-core 0.61.2",
+ "windows-core 0.57.0",
 ]
 
 [[package]]

Cargo.toml

@@ -39,7 +39,7 @@ crossbeam-channel      = "0.5"
 dispatch2              = "0.3"
 docx-parser            = { git = "https://github.com/toeverything/docx-parser" }
 dotenvy                = "0.15"
-file-format            = { version = "0.28", features = ["reader"] }
+file-format            = { version = "0.26", features = ["reader"] }
 homedir                = "0.3"
 infer                  = { version = "0.19.0" }
 lasso                  = { version = "0.7", features = ["multi-threaded"] }

README.md

@@ -81,7 +81,7 @@ Star us, and you will receive all release notifications from GitHub without any
 
 **Multimodal AI partner ready to kick in any work**
 
-- Write up professional work report? Turn an outline into expressive and presentable slides? Summary an article into a well-structured mindmap? Sorting your job plan and backlog for tasks? Or... draw and code prototype apps and web pages directly all with one prompt? With you, [AFFiNE AI](https://affine.pro/ai) pushes your creativity to the edge of your imagination, just like [Canvas AI](https://affine.pro/blog/best-canvas-ai) to generate mind map for brainstorming.
+- Write up professional work report? Turn an outline into expressive and presentable slides? Summary an article into a well-structured mindmap? Sorting your job plan and backlog for tasks? Or... draw and code prototype apps and web pages directly all with one prompt? With you, [AFFiNE AI](https://affine.pro/ai) pushes your creativity to the edge of your imagination,just like [Canvas AI](https://affine.pro/blog/best-canvas-ai) to generate mind map for brainstorming.
 
 **Local-first & Real-time collaborative**
 

SECURITY.md

@@ -6,12 +6,12 @@ We recommend users to always use the latest major version. Security updates will
 
 | Version         | Supported          |
 | --------------- | ------------------ |
-| 0.24.x (stable) | :white_check_mark: |
-| < 0.24.x        | :x:                |
+| 0.17.x (stable) | :white_check_mark: |
+| < 0.17.x        | :x:                |
 
 ## Reporting a Vulnerability
 
-We welcome you to provide us with bug reports via and email at [security@toeverything.info](mailto:security@toeverything.info) or submit directly on [GitHub](https://github.com/toeverything/AFFiNE/security), **we encourage you to submit the relevant information directly via GitHub**. We expect your report to contain at least the following for us to evaluate and reproduce:
+We welcome you to provide us with bug reports via and email at [security@toeverything.info](mailto:security@toeverything.info). We expect your report to contain at least the following for us to evaluate and reproduce:
 
 1. Using platform and version, for example:
 
@@ -22,6 +22,8 @@ We welcome you to provide us with bug reports via and email at [security@toevery
 
 3. Your classification or analysis of the vulnerability (optional)
 
-Since we are an open source project, we also welcome you to provide corresponding fix PRs, we will determine specific rewards based on the evaluation results.
+Since we are an open source project, we also welcome you to provide corresponding fix PRs.
+
+We will provide bounties for vulnerabilities involving user information leakage, permission leakage, and unauthorized code execution. For other types of vulnerabilities, we will determine specific rewards based on the evaluation results.
 
 If the vulnerability is caused by a library we depend on, we encourage you to submit a security report to the corresponding dependent library at the same time to benefit more users.

blocksuite/affine/blocks/attachment/package.json

@@ -17,7 +17,7 @@
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/affine-widget-slash-menu": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@floating-ui/dom": "^1.6.13",

blocksuite/affine/blocks/bookmark/package.json

@@ -19,7 +19,7 @@
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/affine-widget-slash-menu": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@lit/context": "^1.1.2",

blocksuite/affine/blocks/callout/package.json

@@ -18,11 +18,10 @@
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/affine-widget-slash-menu": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@emoji-mart/data": "^1.2.1",
-    "@emotion/css": "^11.13.5",
     "@floating-ui/dom": "^1.6.10",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",

blocksuite/affine/blocks/callout/src/callout-block-styles.ts

@@ -1,56 +0,0 @@
-import { css } from '@emotion/css';
-
-export const calloutHostStyles = css({
-  display: 'block',
-  margin: '8px 0',
-});
-
-export const calloutBlockContainerStyles = css({
-  display: 'flex',
-  alignItems: 'flex-start',
-  padding: '5px 10px',
-  borderRadius: '8px',
-});
-
-export const calloutEmojiContainerStyles = css({
-  userSelect: 'none',
-  fontSize: '1.2em',
-  width: '24px',
-  height: '24px',
-  display: 'flex',
-  alignItems: 'center',
-  justifyContent: 'center',
-  // marginTop is dynamically set by JavaScript based on first child's height
-  marginBottom: '10px',
-  flexShrink: 0,
-  position: 'relative',
-});
-
-export const calloutEmojiStyles = css({
-  display: 'flex',
-  alignItems: 'center',
-  justifyContent: 'center',
-  ':hover': {
-    cursor: 'pointer',
-    opacity: 0.7,
-  },
-});
-
-export const calloutChildrenStyles = css({
-  flex: 1,
-  minWidth: 0,
-  paddingLeft: '10px',
-});
-
-export const iconPickerContainerStyles = css({
-  position: 'absolute',
-  top: '100%',
-  left: 0,
-  zIndex: 1000,
-  background: 'white',
-  border: '1px solid #ccc',
-  borderRadius: '8px',
-  boxShadow: '0 4px 12px rgba(0, 0, 0, 0.15)',
-  width: '390px',
-  height: '400px',
-});

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

@@ -1,191 +1,84 @@
 import { CaptionedBlockComponent } from '@blocksuite/affine-components/caption';
-import {
-  createPopup,
-  popupTargetFromElement,
-} from '@blocksuite/affine-components/context-menu';
+import { createLitPortal } from '@blocksuite/affine-components/portal';
 import { DefaultInlineManagerExtension } from '@blocksuite/affine-inline-preset';
-import {
-  type CalloutBlockModel,
-  ParagraphBlockModel,
-} from '@blocksuite/affine-model';
-import { focusTextModel } from '@blocksuite/affine-rich-text';
+import { type CalloutBlockModel } from '@blocksuite/affine-model';
 import { EDGELESS_TOP_CONTENTEDITABLE_SELECTOR } from '@blocksuite/affine-shared/consts';
 import {
   DocModeProvider,
-  type IconData,
-  IconPickerServiceIdentifier,
-  IconType,
+  ThemeProvider,
 } from '@blocksuite/affine-shared/services';
-import type { UniComponent } from '@blocksuite/affine-shared/types';
-import * as icons from '@blocksuite/icons/lit';
+import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
 import type { BlockComponent } from '@blocksuite/std';
-import { type Signal } from '@preact/signals-core';
-import { cssVarV2 } from '@toeverything/theme/v2';
-import type { TemplateResult } from 'lit';
-import { html } from 'lit';
-import { type StyleInfo, styleMap } from 'lit/directives/style-map.js';
-
-import {
-  calloutBlockContainerStyles,
-  calloutChildrenStyles,
-  calloutEmojiContainerStyles,
-  calloutEmojiStyles,
-  calloutHostStyles,
-} from './callout-block-styles.js';
-import { IconPickerWrapper } from './icon-picker-wrapper.js';
-// Copy of renderUniLit and UniLit from affine-data-view
-export const renderUniLit = <Props, Expose extends NonNullable<unknown>>(
-  uni: UniComponent<Props, Expose> | undefined,
-  props?: Props,
-  options?: {
-    ref?: Signal<Expose | undefined>;
-    style?: Readonly<StyleInfo>;
-    class?: string;
-  }
-): TemplateResult => {
-  return html` <uni-lit
-    .uni="${uni}"
-    .props="${props}"
-    .ref="${options?.ref}"
-    style=${options?.style ? styleMap(options?.style) : ''}
-  ></uni-lit>`;
-};
-const getIcon = (icon?: IconData) => {
-  if (!icon) {
-    return null;
-  }
-  if (icon.type === IconType.Emoji) {
-    return icon.unicode;
-  }
-  if (icon.type === IconType.AffineIcon) {
-    return (
-      icons as Record<string, (props: { style: string }) => TemplateResult>
-    )[`${icon.name}Icon`]?.({ style: `color:${icon.color}` });
-  }
-  return null;
-};
+import { flip, offset } from '@floating-ui/dom';
+import { css, html } from 'lit';
+import { query } from 'lit/decorators.js';
+import { styleMap } from 'lit/directives/style-map.js';
 export class CalloutBlockComponent extends CaptionedBlockComponent<CalloutBlockModel> {
-  private _popupCloseHandler: (() => void) | null = null;
-
-  override connectedCallback() {
-    super.connectedCallback();
-    this.classList.add(calloutHostStyles);
-  }
-
-  private _getEmojiMarginTop(): string {
-    if (this.model.children.length === 0) {
-      return '10px';
+  static override styles = css`
+    :host {
+      display: block;
+      margin: 8px 0;
     }
 
-    const firstChild = this.model.children[0];
-    const flavour = firstChild.flavour;
-
-    const marginTopMap: Record<string, string> = {
-      'affine:paragraph:h1': '23px',
-      'affine:paragraph:h2': '20px',
-      'affine:paragraph:h3': '16px',
-      'affine:paragraph:h4': '15px',
-      'affine:paragraph:h5': '14px',
-      'affine:paragraph:h6': '13px',
-    };
-
-    // For heading blocks, use the type to determine margin
-    if (flavour === 'affine:paragraph') {
-      const paragraph = firstChild as ParagraphBlockModel;
-      const type = paragraph.props.type$.value;
-      const key = `${flavour}:${type}`;
-      return marginTopMap[key] || '10px';
+    .affine-callout-block-container {
+      display: flex;
+      padding: 5px 10px;
+      border-radius: 8px;
+      background-color: ${unsafeCSSVarV2('block/callout/background/grey')};
     }
 
-    // Default for all other block types
-    return '10px';
-  }
-
-  private _closeIconPicker() {
-    if (this._popupCloseHandler) {
-      this._popupCloseHandler();
-      this._popupCloseHandler = null;
+    .affine-callout-emoji-container {
+      margin-right: 10px;
+      margin-top: 14px;
+      user-select: none;
+      font-size: 1.2em;
+      width: 24px;
+      height: 24px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
     }
-  }
-
-  private _toggleIconPicker(event: MouseEvent) {
-    // If popup is already open, close it
-    if (this._popupCloseHandler) {
-      this._closeIconPicker();
-      return;
+    .affine-callout-emoji:hover {
+      cursor: pointer;
+      opacity: 0.7;
     }
 
-    // Get IconPickerService from the framework
-    const iconPickerService = this.std.getOptional(IconPickerServiceIdentifier);
-    if (!iconPickerService) {
-      console.warn('IconPickerService not found');
-      return;
+    .affine-callout-children {
+      flex: 1;
+      min-width: 0;
+      padding-left: 10px;
     }
+  `;
 
-    // Get the uni-component from the service
-    const iconPickerComponent = iconPickerService.iconPickerComponent;
+  private _emojiMenuAbortController: AbortController | null = null;
+  private readonly _toggleEmojiMenu = () => {
+    if (this._emojiMenuAbortController) {
+      this._emojiMenuAbortController.abort();
+    }
+    this._emojiMenuAbortController = new AbortController();
 
-    // Create props for the icon picker
-    const props = {
-      onSelect: (iconData?: IconData) => {
-        this.model.props.icon$.value = iconData;
-        this._closeIconPicker(); // Close the picker after selection
+    const theme = this.std.get(ThemeProvider).theme$.value;
+
+    createLitPortal({
+      template: html`<affine-emoji-menu
+        .theme=${theme}
+        .onEmojiSelect=${(data: any) => {
+          this.model.props.emoji = data.native;
+        }}
+      ></affine-emoji-menu>`,
+      portalStyles: {
+        zIndex: 'var(--affine-z-index-popover)',
       },
-      onClose: () => {
-        this._closeIconPicker();
-      },
-    };
-
-    // Create IconPickerWrapper instance
-    const wrapper = new IconPickerWrapper();
-    wrapper.iconPickerComponent = iconPickerComponent;
-    wrapper.props = props;
-    wrapper.style.position = 'absolute';
-    wrapper.style.backgroundColor = cssVarV2.layer.background.overlayPanel;
-    wrapper.style.boxShadow = 'var(--affine-menu-shadow)';
-    wrapper.style.borderRadius = '8px';
-
-    // Create popup target from the clicked element
-    const target = popupTargetFromElement(event.currentTarget as HTMLElement);
-
-    // Create popup
-    this._popupCloseHandler = createPopup(target, wrapper, {
-      onClose: () => {
-        this._popupCloseHandler = null;
+      container: this.host,
+      computePosition: {
+        referenceElement: this._emojiButton,
+        placement: 'bottom-start',
+        middleware: [flip(), offset(4)],
+        autoUpdate: { animationFrame: true },
       },
+      abortController: this._emojiMenuAbortController,
+      closeOnClickAway: true,
     });
-  }
-
-  private readonly _handleBlockClick = (event: MouseEvent) => {
-    // Check if the click target is emoji related element
-    const target = event.target as HTMLElement;
-    if (
-      target.closest('.affine-callout-emoji-container') ||
-      target.classList.contains('affine-callout-emoji')
-    ) {
-      return;
-    }
-
-    // If there's no icon, open icon picker on click
-    const icon = this.model.props.icon$.value;
-    if (!icon) {
-      this._toggleIconPicker(event);
-      return;
-    }
-
-    // Only handle clicks when there are no children
-    if (this.model.children.length > 0) {
-      return;
-    }
-
-    // Prevent event bubbling
-    event.stopPropagation();
-
-    // Create a new paragraph block
-    const paragraphId = this.store.addBlock('affine:paragraph', {}, this.model);
-
-    // Focus the new paragraph
-    focusTextModel(this.std, paragraphId);
   };
 
   get attributeRenderer() {
@@ -204,6 +97,9 @@ export class CalloutBlockComponent extends CaptionedBlockComponent<CalloutBlockM
     return this.std.get(DefaultInlineManagerExtension.identifier);
   }
 
+  @query('.affine-callout-emoji')
+  private accessor _emojiButton!: HTMLElement;
+
   override get topContenteditableElement() {
     if (this.std.get(DocModeProvider).getEditorMode() === 'edgeless') {
       return this.closest<BlockComponent>(
@@ -214,39 +110,20 @@ export class CalloutBlockComponent extends CaptionedBlockComponent<CalloutBlockM
   }
 
   override renderBlock() {
-    const icon = this.model.props.icon$.value;
-    const backgroundColorName = this.model.props.backgroundColorName$.value;
-    const backgroundColor = (
-      cssVarV2.block.callout.background as Record<string, string>
-    )[backgroundColorName ?? ''];
-
-    const iconContent = getIcon(icon);
-
+    const emoji = this.model.props.emoji$.value;
     return html`
-      <div
-        class="${calloutBlockContainerStyles}"
-        @click=${this._handleBlockClick}
-        style=${styleMap({
-          backgroundColor: backgroundColor ?? 'transparent',
-        })}
-      >
-        ${iconContent
-          ? html`
-              <div
-                @click=${this._toggleIconPicker}
-                contenteditable="false"
-                class="${calloutEmojiContainerStyles}"
-                style=${styleMap({
-                  marginTop: this._getEmojiMarginTop(),
-                })}
-              >
-                <span class="${calloutEmojiStyles}" data-testid="callout-emoji"
-                  >${iconContent}</span
-                >
-              </div>
-            `
-          : ''}
-        <div class="${calloutChildrenStyles}">
+      <div class="affine-callout-block-container">
+        <div
+          @click=${this._toggleEmojiMenu}
+          contenteditable="false"
+          class="affine-callout-emoji-container"
+          style=${styleMap({
+            display: emoji.length === 0 ? 'none' : undefined,
+          })}
+        >
+          <span class="affine-callout-emoji">${emoji}</span>
+        </div>
+        <div class="affine-callout-children">
           ${this.renderChildren(this.model)}
         </div>
       </div>

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

@@ -1,7 +1,4 @@
-import {
-  CalloutBlockModel,
-  ParagraphBlockModel,
-} from '@blocksuite/affine-model';
+import { CalloutBlockModel } from '@blocksuite/affine-model';
 import { matchModels } from '@blocksuite/affine-shared/utils';
 import {
   BlockSelection,
@@ -9,46 +6,13 @@ import {
   TextSelection,
 } from '@blocksuite/std';
 
-import { calloutToParagraphCommand } from './commands/callout-to-paragraph.js';
-import { splitCalloutCommand } from './commands/split-callout.js';
-
 export const CalloutKeymapExtension = KeymapExtension(std => {
   return {
-    Enter: ctx => {
-      const text = std.selection.find(TextSelection);
-      if (!text) return false;
-
-      const currentBlock = std.store.getBlock(text.from.blockId);
-      if (!currentBlock) return false;
-
-      // Check if current block is a callout block
-      let calloutBlock = currentBlock;
-      if (!matchModels(currentBlock.model, [CalloutBlockModel])) {
-        // If not, check if the parent is a callout block
-        const parent = std.store.getParent(currentBlock.model);
-        if (!parent || !matchModels(parent, [CalloutBlockModel])) {
-          return false;
-        }
-        const parentBlock = std.store.getBlock(parent.id);
-        if (!parentBlock) return false;
-        calloutBlock = parentBlock;
-      }
-
-      ctx.get('keyboardState').raw.preventDefault();
-      std.command
-        .chain()
-        .pipe(splitCalloutCommand, {
-          blockId: calloutBlock.model.id,
-          inlineIndex: text.from.index,
-          currentBlockId: text.from.blockId,
-        })
-        .run();
-      return true;
-    },
     Backspace: ctx => {
       const text = std.selection.find(TextSelection);
       if (text && text.isCollapsed() && text.from.index === 0) {
         const event = ctx.get('defaultState').event;
+        event.preventDefault();
 
         const block = std.store.getBlock(text.from.blockId);
         if (!block) return false;
@@ -56,22 +20,6 @@ export const CalloutKeymapExtension = KeymapExtension(std => {
         if (!parent) return false;
         if (!matchModels(parent, [CalloutBlockModel])) return false;
 
-        // Check if current block is a paragraph inside callout
-        if (matchModels(block.model, [ParagraphBlockModel])) {
-          event.preventDefault();
-
-          std.command
-            .chain()
-            .pipe(calloutToParagraphCommand, {
-              id: block.model.id,
-            })
-            .run();
-
-          return true;
-        }
-
-        // Fallback to selecting the callout block
-        event.preventDefault();
         std.selection.setGroup('note', [
           std.selection.create(BlockSelection, {
             blockId: parent.id,

blocksuite/affine/blocks/callout/src/commands/callout-to-paragraph.ts

@@ -1,86 +0,0 @@
-import {
-  CalloutBlockModel,
-  ParagraphBlockModel,
-} from '@blocksuite/affine-model';
-import { focusTextModel } from '@blocksuite/affine-rich-text';
-import { matchModels } from '@blocksuite/affine-shared/utils';
-import type { Command } from '@blocksuite/std';
-import { BlockSelection } from '@blocksuite/std';
-import { Text } from '@blocksuite/store';
-
-export const calloutToParagraphCommand: Command<
-  {
-    id: string;
-    stopCapturing?: boolean;
-  },
-  {
-    success: boolean;
-  }
-> = (ctx, next) => {
-  const { id, stopCapturing = true } = ctx;
-  const std = ctx.std;
-  const doc = std.store;
-  const model = doc.getBlock(id)?.model;
-
-  if (!model || !matchModels(model, [ParagraphBlockModel])) return false;
-
-  const parent = doc.getParent(model);
-  if (!parent || !matchModels(parent, [CalloutBlockModel])) return false;
-
-  if (stopCapturing) std.store.captureSync();
-
-  // Get current block index in callout
-  const currentIndex = parent.children.indexOf(model);
-  const hasText = model.text && model.text.length > 0;
-
-  // Find previous paragraph block in callout
-  let previousBlock = null;
-  for (let i = currentIndex - 1; i >= 0; i--) {
-    const sibling = parent.children[i];
-    if (matchModels(sibling, [ParagraphBlockModel])) {
-      previousBlock = sibling;
-      break;
-    }
-  }
-
-  if (previousBlock && hasText) {
-    // Clone current text content before any operations to prevent data loss
-    const currentText = model.text || new Text();
-
-    // Get previous block text and merge index
-    const previousText = previousBlock.text || new Text();
-    const mergeIndex = previousText.length;
-
-    // Apply each delta from cloned current text to previous block to preserve formatting
-    previousText.join(currentText);
-
-    // Remove current block after text has been merged
-    doc.deleteBlock(model, {
-      deleteChildren: false,
-    });
-
-    // Focus at merge point in previous block
-    focusTextModel(std, previousBlock.id, mergeIndex);
-  } else if (previousBlock && !hasText) {
-    // Move cursor to end of previous block
-    doc.deleteBlock(model, {
-      deleteChildren: false,
-    });
-
-    const previousText = previousBlock.text || new Text();
-    focusTextModel(std, previousBlock.id, previousText.length);
-  } else {
-    // No previous block, select the entire callout
-    doc.deleteBlock(model, {
-      deleteChildren: false,
-    });
-
-    std.selection.setGroup('note', [
-      std.selection.create(BlockSelection, {
-        blockId: parent.id,
-      }),
-    ]);
-  }
-
-  return next({ success: true });
-};

blocksuite/affine/blocks/callout/src/commands/split-callout.ts

@@ -1,85 +0,0 @@
-import {
-  CalloutBlockModel,
-  ParagraphBlockModel,
-} from '@blocksuite/affine-model';
-import { focusTextModel } from '@blocksuite/affine-rich-text';
-import { matchModels } from '@blocksuite/affine-shared/utils';
-import type { Command, EditorHost } from '@blocksuite/std';
-
-export const splitCalloutCommand: Command<{
-  blockId: string;
-  inlineIndex: number;
-  currentBlockId: string;
-}> = (ctx, next) => {
-  const { blockId, inlineIndex, currentBlockId, std } = ctx;
-  const host = std.host as EditorHost;
-  const doc = host.store;
-
-  const calloutModel = doc.getBlock(blockId)?.model;
-  if (!calloutModel || !matchModels(calloutModel, [CalloutBlockModel])) {
-    console.error(`block ${blockId} is not a callout block`);
-    return;
-  }
-
-  const currentModel = doc.getBlock(currentBlockId)?.model;
-  if (!currentModel) {
-    console.error(`current block ${currentBlockId} not found`);
-    return;
-  }
-
-  doc.captureSync();
-
-  if (matchModels(currentModel, [ParagraphBlockModel])) {
-    // User is in a paragraph within the callout's children
-    const afterText = currentModel.props.text.split(inlineIndex);
-
-    // Update the current paragraph's text to keep only the part before cursor
-    doc.transact(() => {
-      currentModel.props.text.delete(
-        inlineIndex,
-        currentModel.props.text.length - inlineIndex
-      );
-    });
-
-    // Create a new paragraph block after the current one
-    const parent = doc.getParent(currentModel);
-    if (parent) {
-      const currentIndex = parent.children.indexOf(currentModel);
-      const newParagraphId = doc.addBlock(
-        'affine:paragraph',
-        {
-          text: afterText,
-        },
-        parent,
-        currentIndex + 1
-      );
-
-      if (newParagraphId) {
-        host.updateComplete
-          .then(() => {
-            focusTextModel(std, newParagraphId);
-          })
-          .catch(console.error);
-      }
-    }
-  } else {
-    // If current block is not a paragraph, create a new paragraph in callout
-    const newParagraphId = doc.addBlock(
-      'affine:paragraph',
-      {
-        text: new Text(),
-      },
-      calloutModel
-    );
-
-    if (newParagraphId) {
-      host.updateComplete
-        .then(() => {
-          focusTextModel(std, newParagraphId);
-        })
-        .catch(console.error);
-    }
-  }
-
-  next();
-};

blocksuite/affine/blocks/callout/src/configs/slash-menu.ts

@@ -1,12 +1,24 @@
+import { CalloutBlockModel } from '@blocksuite/affine-model';
 import { focusBlockEnd } from '@blocksuite/affine-shared/commands';
 import { FeatureFlagService } from '@blocksuite/affine-shared/services';
-import { isInsideBlockByFlavour } from '@blocksuite/affine-shared/utils';
+import {
+  findAncestorModel,
+  isInsideBlockByFlavour,
+  matchModels,
+} from '@blocksuite/affine-shared/utils';
 import { type SlashMenuConfig } from '@blocksuite/affine-widget-slash-menu';
 import { FontIcon } from '@blocksuite/icons/lit';
 
 import { calloutTooltip } from './tooltips';
 
 export const calloutSlashMenuConfig: SlashMenuConfig = {
+  disableWhen: ({ model }) => {
+    return (
+      findAncestorModel(model, ancestor =>
+        matchModels(ancestor, [CalloutBlockModel])
+      ) !== null
+    );
+  },
   items: [
     {
       name: 'Callout',

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

@@ -1,204 +0,0 @@
-import {
-  createPopup,
-  popupTargetFromElement,
-} from '@blocksuite/affine-components/context-menu';
-import { EditorChevronDown } from '@blocksuite/affine-components/toolbar';
-import { CalloutBlockModel } from '@blocksuite/affine-model';
-import {
-  ActionPlacement,
-  type IconData,
-  IconPickerServiceIdentifier,
-  type ToolbarAction,
-  type ToolbarActionGroup,
-  type ToolbarModuleConfig,
-  ToolbarModuleExtension,
-} from '@blocksuite/affine-shared/services';
-import { DeleteIcon, PaletteIcon, SmileIcon } from '@blocksuite/icons/lit';
-import { BlockFlavourIdentifier } from '@blocksuite/std';
-import type { ExtensionType } from '@blocksuite/store';
-import { cssVarV2 } from '@toeverything/theme/v2';
-import { html } from 'lit';
-import { repeat } from 'lit/directives/repeat.js';
-import { styleMap } from 'lit/directives/style-map.js';
-
-import { IconPickerWrapper } from '../icon-picker-wrapper.js';
-
-const colors = [
-  'default',
-  'red',
-  'orange',
-  'yellow',
-  'green',
-  'teal',
-  'blue',
-  'purple',
-  'grey',
-] as const;
-
-const backgroundColorAction = {
-  id: 'background-color',
-  label: 'Background Color',
-  tooltip: 'Change background color',
-  icon: PaletteIcon(),
-  run() {
-    // This will be handled by the content function
-  },
-  content(ctx) {
-    const model = ctx.getCurrentModelByType(CalloutBlockModel);
-    if (!model) return null;
-
-    const updateBackground = (color: string) => {
-      ctx.store.updateBlock(model, { backgroundColorName: color });
-    };
-
-    return html`
-      <editor-menu-button
-        .contentPadding=${'8px'}
-        .button=${html`
-          <editor-icon-button
-            aria-label="background"
-            .tooltip=${'Background Color'}
-          >
-            ${PaletteIcon()} ${EditorChevronDown}
-          </editor-icon-button>
-        `}
-      >
-        <div data-size="large" data-orientation="vertical">
-          <div class="highlight-heading">Background</div>
-          ${repeat(colors, color => {
-            const isDefault = color === 'default';
-            const value = isDefault
-              ? null
-              : `var(--affine-text-highlight-${color})`;
-            const displayName = `${color} Background`;
-
-            return html`
-              <editor-menu-action
-                data-testid="background-${color}"
-                @click=${() => updateBackground(color)}
-              >
-                <affine-text-duotone-icon
-                  style=${styleMap({
-                    '--color': 'var(--affine-text-primary-color)',
-                    '--background': value ?? 'transparent',
-                  })}
-                ></affine-text-duotone-icon>
-                <span class="label capitalize">${displayName}</span>
-              </editor-menu-action>
-            `;
-          })}
-        </div>
-      </editor-menu-button>
-    `;
-  },
-} satisfies ToolbarAction;
-
-const iconPickerAction = {
-  id: 'icon-picker',
-  label: 'Icon Picker',
-  tooltip: 'Change icon',
-  icon: SmileIcon(),
-  run() {
-    // This will be handled by the content function
-  },
-  content(ctx) {
-    const model = ctx.getCurrentModelByType(CalloutBlockModel);
-    if (!model) return null;
-
-    const handleIconPickerClick = (event: MouseEvent) => {
-      // Get IconPickerService from the framework
-      const iconPickerService = ctx.std.getOptional(
-        IconPickerServiceIdentifier
-      );
-      if (!iconPickerService) {
-        console.warn('IconPickerService not found');
-        return;
-      }
-
-      // Get the uni-component from the service
-      const iconPickerComponent = iconPickerService.iconPickerComponent;
-
-      // Create props for the icon picker
-      const props = {
-        onSelect: (iconData?: IconData) => {
-          // When iconData is undefined (delete icon), set icon to undefined
-          ctx.store.updateBlock(model, { icon: iconData });
-          closeHandler(); // Close the picker after selection
-        },
-        onClose: () => {
-          closeHandler();
-        },
-      };
-
-      // Create IconPickerWrapper instance
-      const wrapper = new IconPickerWrapper();
-      wrapper.iconPickerComponent = iconPickerComponent;
-      wrapper.props = props;
-      wrapper.style.position = 'absolute';
-      wrapper.style.backgroundColor = cssVarV2.layer.background.overlayPanel;
-      wrapper.style.boxShadow = 'var(--affine-menu-shadow)';
-      wrapper.style.borderRadius = '8px';
-
-      // Create popup target from the clicked element
-      const target = popupTargetFromElement(event.currentTarget as HTMLElement);
-
-      // Create popup
-      const closeHandler = createPopup(target, wrapper, {
-        onClose: () => {
-          // Cleanup if needed
-        },
-      });
-    };
-
-    return html`
-      <editor-icon-button
-        aria-label="icon-picker"
-        .tooltip=${'Change Icon'}
-        @click=${handleIconPickerClick}
-      >
-        ${SmileIcon()} ${EditorChevronDown}
-      </editor-icon-button>
-    `;
-  },
-} satisfies ToolbarAction;
-
-const builtinToolbarConfig = {
-  actions: [
-    {
-      id: 'style',
-      actions: [backgroundColorAction],
-    } satisfies ToolbarActionGroup<ToolbarAction>,
-    {
-      id: 'icon',
-      actions: [iconPickerAction],
-    } satisfies ToolbarActionGroup<ToolbarAction>,
-    {
-      placement: ActionPlacement.More,
-      id: 'c.delete',
-      label: 'Delete',
-      icon: DeleteIcon(),
-      variant: 'destructive',
-      run(ctx) {
-        const model = ctx.getCurrentModelByType(CalloutBlockModel);
-        if (!model) return;
-
-        ctx.store.deleteBlock(model);
-
-        // Clears
-        ctx.select('note');
-        ctx.reset();
-      },
-    } satisfies ToolbarAction,
-  ],
-} as const satisfies ToolbarModuleConfig;
-
-export const createBuiltinToolbarConfigExtension = (
-  flavour: string
-): ExtensionType[] => {
-  return [
-    ToolbarModuleExtension({
-      id: BlockFlavourIdentifier(flavour),
-      config: builtinToolbarConfig,
-    }),
-  ];
-};

blocksuite/affine/blocks/callout/src/effects.ts

@@ -1,14 +1,14 @@
 import { CalloutBlockComponent } from './callout-block';
-import { IconPickerWrapper } from './icon-picker-wrapper';
+import { EmojiMenu } from './emoji-menu';
 
 export function effects() {
   customElements.define('affine-callout', CalloutBlockComponent);
-  customElements.define('icon-picker-wrapper', IconPickerWrapper);
+  customElements.define('affine-emoji-menu', EmojiMenu);
 }
 
 declare global {
   interface HTMLElementTagNameMap {
     'affine-callout': CalloutBlockComponent;
-    'icon-picker-wrapper': IconPickerWrapper;
+    'affine-emoji-menu': EmojiMenu;
   }
 }

blocksuite/affine/blocks/callout/src/emoji-menu.ts

@@ -0,0 +1,34 @@
+import { WithDisposable } from '@blocksuite/global/lit';
+import data from '@emoji-mart/data';
+import { Picker } from 'emoji-mart';
+import { html, LitElement, type PropertyValues } from 'lit';
+import { property, query } from 'lit/decorators.js';
+
+export class EmojiMenu extends WithDisposable(LitElement) {
+  override firstUpdated(props: PropertyValues) {
+    const result = super.firstUpdated(props);
+
+    const picker = new Picker({
+      data,
+      onEmojiSelect: this.onEmojiSelect,
+      autoFocus: true,
+      theme: this.theme,
+    });
+    this.emojiMenu.append(picker as unknown as Node);
+
+    return result;
+  }
+
+  @property({ attribute: false })
+  accessor onEmojiSelect: (data: any) => void = () => {};
+
+  @property({ attribute: false })
+  accessor theme: 'light' | 'dark' = 'light';
+
+  @query('.affine-emoji-menu')
+  accessor emojiMenu!: HTMLElement;
+
+  override render() {
+    return html`<div class="affine-emoji-menu"></div>`;
+  }
+}

blocksuite/affine/blocks/callout/src/icon-picker-wrapper.ts

@@ -1,52 +0,0 @@
-import type { IconData } from '@blocksuite/affine-shared/services';
-import type { UniComponent } from '@blocksuite/affine-shared/types';
-import { ShadowlessElement } from '@blocksuite/std';
-import { type Signal } from '@preact/signals-core';
-import { html, type TemplateResult } from 'lit';
-import { type StyleInfo, styleMap } from 'lit/directives/style-map.js';
-
-// Copy of renderUniLit from callout-block.ts
-const renderUniLit = <Props, Expose extends NonNullable<unknown>>(
-  uni: UniComponent<Props, Expose> | undefined,
-  props?: Props,
-  options?: {
-    ref?: Signal<Expose | undefined>;
-    style?: Readonly<StyleInfo>;
-    class?: string;
-  }
-): TemplateResult => {
-  return html` <uni-lit
-    .uni="${uni}"
-    .props="${props}"
-    .ref="${options?.ref}"
-    style=${options?.style ? styleMap(options?.style) : ''}
-  ></uni-lit>`;
-};
-
-export interface IconPickerWrapperProps {
-  onSelect?: (iconData?: IconData) => void;
-  onClose?: () => void;
-}
-
-export class IconPickerWrapper extends ShadowlessElement {
-  iconPickerComponent?: UniComponent<IconPickerWrapperProps, any>;
-  props?: IconPickerWrapperProps;
-
-  constructor() {
-    super();
-  }
-
-  override render() {
-    if (!this.iconPickerComponent) {
-      return html``;
-    }
-
-    return renderUniLit(this.iconPickerComponent, this.props);
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    'icon-picker-wrapper': IconPickerWrapper;
-  }
-}

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

@@ -8,7 +8,6 @@ import { literal } from 'lit/static-html.js';
 
 import { CalloutKeymapExtension } from './callout-keymap';
 import { calloutSlashMenuConfig } from './configs/slash-menu';
-import { createBuiltinToolbarConfigExtension } from './configs/toolbar';
 import { effects } from './effects';
 
 export class CalloutViewExtension extends ViewExtensionProvider {
@@ -26,7 +25,6 @@ export class CalloutViewExtension extends ViewExtensionProvider {
       BlockViewExtension('affine:callout', literal`affine-callout`),
       CalloutKeymapExtension,
       SlashMenuConfigExtension('affine:callout', calloutSlashMenuConfig),
-      ...createBuiltinToolbarConfigExtension('affine:callout'),
     ]);
   }
 }

blocksuite/affine/blocks/code/package.json

@@ -22,7 +22,7 @@
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/affine-widget-slash-menu": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@floating-ui/dom": "^1.6.13",

blocksuite/affine/blocks/data-view/package.json

@@ -18,7 +18,7 @@
     "@blocksuite/affine-widget-slash-menu": "workspace:*",
     "@blocksuite/data-view": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@floating-ui/dom": "^1.6.13",

blocksuite/affine/blocks/database/package.json

@@ -21,7 +21,7 @@
     "@blocksuite/affine-widget-slash-menu": "workspace:*",
     "@blocksuite/data-view": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@emotion/css": "^11.13.5",

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

@@ -20,7 +20,7 @@
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@floating-ui/dom": "^1.6.13",

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

@@ -20,7 +20,7 @@
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/affine-widget-slash-menu": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@floating-ui/dom": "^1.6.13",

blocksuite/affine/blocks/embed/package.json

@@ -20,7 +20,7 @@
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/affine-widget-slash-menu": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@floating-ui/dom": "^1.6.13",

blocksuite/affine/blocks/frame/package.json

@@ -19,7 +19,7 @@
     "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*",
     "@blocksuite/affine-widget-frame-title": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@floating-ui/dom": "^1.6.13",

blocksuite/affine/blocks/image/package.json

@@ -19,7 +19,7 @@
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/affine-widget-slash-menu": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@floating-ui/dom": "^1.6.13",

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

@@ -1,5 +1,4 @@
-import { updateBlockAlign } from '@blocksuite/affine-block-note';
-import { ImageBlockModel, TextAlign } from '@blocksuite/affine-model';
+import { ImageBlockModel } from '@blocksuite/affine-model';
 import {
   ActionPlacement,
   blockCommentToolbarButton,
@@ -13,9 +12,6 @@ import {
   DeleteIcon,
   DownloadIcon,
   DuplicateIcon,
-  TextAlignCenterIcon,
-  TextAlignLeftIcon,
-  TextAlignRightIcon,
 } from '@blocksuite/icons/lit';
 import { BlockFlavourIdentifier } from '@blocksuite/std';
 import type { ExtensionType } from '@blocksuite/store';
@@ -55,55 +51,7 @@ const builtinToolbarConfig = {
       },
     },
     {
-      id: 'c.1.align-left',
-      tooltip: 'Align left',
-      icon: TextAlignLeftIcon(),
-      run(ctx) {
-        const block = ctx.getCurrentBlockByType(ImageBlockComponent);
-        if (block) {
-          ctx.chain
-            .pipe(updateBlockAlign, {
-              textAlign: TextAlign.Left,
-              selectedBlocks: [block],
-            })
-            .run();
-        }
-      },
-    },
-    {
-      id: 'c.2.align-center',
-      tooltip: 'Align center',
-      icon: TextAlignCenterIcon(),
-      run(ctx) {
-        const block = ctx.getCurrentBlockByType(ImageBlockComponent);
-        if (block) {
-          ctx.chain
-            .pipe(updateBlockAlign, {
-              textAlign: TextAlign.Center,
-              selectedBlocks: [block],
-            })
-            .run();
-        }
-      },
-    },
-    {
-      id: 'c.3.align-right',
-      tooltip: 'Align right',
-      icon: TextAlignRightIcon(),
-      run(ctx) {
-        const block = ctx.getCurrentBlockByType(ImageBlockComponent);
-        if (block) {
-          ctx.chain
-            .pipe(updateBlockAlign, {
-              textAlign: TextAlign.Right,
-              selectedBlocks: [block],
-            })
-            .run();
-        }
-      },
-    },
-    {
-      id: 'd.comment',
+      id: 'c.comment',
       ...blockCommentToolbarButton,
     },
     {

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

@@ -143,15 +143,6 @@ export class ImageBlockComponent extends CaptionedBlockComponent<ImageBlockModel
       width: '100%',
     });
 
-    const alignItemsStyleMap = styleMap({
-      alignItems:
-        this.model.props.textAlign$.value === 'left'
-          ? 'flex-start'
-          : this.model.props.textAlign$.value === 'right'
-            ? 'flex-end'
-            : undefined,
-    });
-
     const resovledState = this.resourceController.resolveStateWith({
       loadingIcon: LoadingIcon({
         strokeColor: cssVarV2('button/pureWhiteText'),
@@ -171,7 +162,6 @@ export class ImageBlockComponent extends CaptionedBlockComponent<ImageBlockModel
             html`<affine-page-image
               .block=${this}
               .state=${resovledState}
-              style="${alignItemsStyleMap}"
             ></affine-page-image>`,
           () =>
             html`<affine-image-fallback-card

blocksuite/affine/blocks/latex/package.json

@@ -19,7 +19,7 @@
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/affine-widget-slash-menu": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@floating-ui/dom": "^1.6.13",

blocksuite/affine/blocks/list/package.json

@@ -18,7 +18,7 @@
     "@blocksuite/affine-rich-text": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@floating-ui/dom": "^1.6.13",

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

@@ -150,10 +150,6 @@ export class ListBlockComponent extends CaptionedBlockComponent<ListBlockModel>
 
     const listIcon = getListIcon(model, !collapsed, _onClickIcon);
 
-    const textAlignStyle = styleMap({
-      textAlign: this.model.props.textAlign$?.value,
-    });
-
     const children = html`<div
       class="affine-block-children-container"
       style=${styleMap({
@@ -165,7 +161,7 @@ export class ListBlockComponent extends CaptionedBlockComponent<ListBlockModel>
     </div>`;
 
     return html`
-      <div class=${'affine-list-block-container'} style="${textAlignStyle}">
+      <div class=${'affine-list-block-container'}>
         <div
           class=${classMap({
             'affine-list-rich-text-wrapper': true,

blocksuite/affine/blocks/note/package.json

@@ -22,7 +22,7 @@
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/affine-widget-slash-menu": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@lit/context": "^1.1.2",

blocksuite/affine/blocks/note/src/commands/index.ts

@@ -8,4 +8,3 @@ export { indentBlock } from './indent-block.js';
 export { indentBlocks } from './indent-blocks.js';
 export { selectBlock } from './select-block.js';
 export { selectBlocksBetween } from './select-blocks-between.js';
-export { updateBlockAlign } from './update-block-align.js';

blocksuite/affine/blocks/note/src/commands/update-block-align.ts

@@ -1,53 +0,0 @@
-import type { TextAlign } from '@blocksuite/affine-model';
-import {
-  getBlockSelectionsCommand,
-  getImageSelectionsCommand,
-  getSelectedBlocksCommand,
-  getTextSelectionCommand,
-} from '@blocksuite/affine-shared/commands';
-import {
-  type BlockComponent,
-  type Command,
-  TextSelection,
-} from '@blocksuite/std';
-
-type UpdateBlockAlignConfig = {
-  textAlign: TextAlign;
-  selectedBlocks?: BlockComponent[];
-};
-
-export const updateBlockAlign: Command<UpdateBlockAlignConfig> = (
-  ctx,
-  next
-) => {
-  let { std, textAlign, selectedBlocks } = ctx;
-
-  if (!selectedBlocks) {
-    const [result, ctx] = std.command
-      .chain()
-      .tryAll(chain => [
-        chain.pipe(getTextSelectionCommand),
-        chain.pipe(getBlockSelectionsCommand),
-        chain.pipe(getImageSelectionsCommand),
-      ])
-      .pipe(getSelectedBlocksCommand, { types: ['text', 'block', 'image'] })
-      .run();
-    if (result) {
-      selectedBlocks = ctx.selectedBlocks;
-    }
-  }
-
-  if (!selectedBlocks || selectedBlocks.length === 0) return false;
-
-  selectedBlocks.forEach(block => {
-    std.store.updateBlock(block.model, { textAlign });
-  });
-
-  const selectionManager = std.host.selection;
-  const textSelection = selectionManager.find(TextSelection);
-  if (!textSelection) {
-    return false;
-  }
-  selectionManager.setGroup('note', [textSelection]);
-  return next();
-};

blocksuite/affine/blocks/note/src/configs/slash-menu.ts

@@ -4,15 +4,9 @@ import {
   textFormatConfigs,
 } from '@blocksuite/affine-inline-preset';
 import {
-  type TextAlignConfig,
-  textAlignConfigs,
   type TextConversionConfig,
   textConversionConfigs,
 } from '@blocksuite/affine-rich-text';
-import {
-  getSelectedModelsCommand,
-  getTextSelectionCommand,
-} from '@blocksuite/affine-shared/commands';
 import { isInsideBlockByFlavour } from '@blocksuite/affine-shared/utils';
 import {
   type SlashMenuActionItem,
@@ -23,7 +17,7 @@ import {
 import { HeadingsIcon } from '@blocksuite/icons/lit';
 import { BlockSelection } from '@blocksuite/std';
 
-import { updateBlockAlign, updateBlockType } from '../commands';
+import { updateBlockType } from '../commands';
 import { tooltips } from './tooltips';
 
 let basicIndex = 0;
@@ -66,10 +60,6 @@ const noteSlashMenuConfig: SlashMenuConfig = {
         createConversionItem(config, `1_List@${index++}`)
       ),
 
-    ...textAlignConfigs.map((config, index) =>
-      createAlignItem(config, `2_Align@${index++}`)
-    ),
-
     ...textFormatConfigs
       .filter(i => !['Code', 'Link'].includes(i.name))
       .map((config, index) =>
@@ -99,26 +89,6 @@ function createConversionItem(
   };
 }
 
-function createAlignItem(
-  config: TextAlignConfig,
-  group?: SlashMenuItem['group']
-): SlashMenuActionItem {
-  const { textAlign, name, icon } = config;
-  return {
-    name,
-    group,
-    icon,
-    action: ({ std }) => {
-      std.command
-        .chain()
-        .pipe(getTextSelectionCommand)
-        .pipe(getSelectedModelsCommand, { types: ['text'] })
-        .pipe(updateBlockAlign, { textAlign })
-        .run();
-    },
-  };
-}
-
 function createTextFormatItem(
   config: TextFormatConfig,
   group?: SlashMenuItem['group']

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

@@ -5,10 +5,7 @@ import {
   NoteBlockSchema,
   ParagraphBlockModel,
 } from '@blocksuite/affine-model';
-import {
-  textAlignConfigs,
-  textConversionConfigs,
-} from '@blocksuite/affine-rich-text';
+import { textConversionConfigs } from '@blocksuite/affine-rich-text';
 import {
   focusBlockEnd,
   focusBlockStart,
@@ -39,7 +36,6 @@ import {
   indentBlocks,
   selectBlock,
   selectBlocksBetween,
-  updateBlockAlign,
   updateBlockType,
 } from './commands';
 import { moveBlockConfigs } from './move-block';
@@ -161,36 +157,6 @@ class NoteKeymap {
       );
   };
 
-  private readonly _bindTextAlignHotKey = () => {
-    return textAlignConfigs.reduce(
-      (acc, item) => {
-        const keymap = item.hotkey!.reduce(
-          (acc, key) => {
-            return {
-              ...acc,
-              [key]: ctx => {
-                ctx.get('defaultState').event.preventDefault();
-                const [result] = this._std.command
-                  .chain()
-                  .pipe(updateBlockAlign, { textAlign: item.textAlign })
-                  .run();
-
-                return result;
-              },
-            };
-          },
-          {} as Record<string, UIEventHandler>
-        );
-
-        return {
-          ...acc,
-          ...keymap,
-        };
-      },
-      {} as Record<string, UIEventHandler>
-    );
-  };
-
   private _focusBlock: BlockComponent | null = null;
 
   private readonly _getClosestNoteByBlockId = (blockId: string) => {
@@ -602,7 +568,6 @@ class NoteKeymap {
       ...this._bindMoveBlockHotKey(),
       ...this._bindQuickActionHotKey(),
       ...this._bindTextConversionHotKey(),
-      ...this._bindTextAlignHotKey(),
       Tab: ctx => {
         const [success] = this.std.command.exec(indentBlocks);
 

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

@@ -264,10 +264,6 @@ export class ParagraphBlockComponent extends CaptionedBlockComponent<ParagraphBl
       `;
     }
 
-    const textAlignStyle = styleMap({
-      textAlign: this.model.props.textAlign$?.value,
-    });
-
     const children = html`<div
       class="affine-block-children-container"
       style=${styleMap({
@@ -292,7 +288,6 @@ export class ParagraphBlockComponent extends CaptionedBlockComponent<ParagraphBl
           'affine-paragraph-block-container': true,
           'highlight-comment': this.isCommentHighlighted,
         })}
-        style="${textAlignStyle}"
         data-has-collapsed-siblings="${collapsedSiblings.length > 0}"
       >
         <div

blocksuite/affine/blocks/root/package.json

@@ -38,7 +38,7 @@
     "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*",
     "@blocksuite/data-view": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@floating-ui/dom": "^1.6.13",

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

@@ -8,10 +8,7 @@ import {
   notifyDocCreated,
   promptDocTitle,
 } from '@blocksuite/affine-block-embed';
-import {
-  updateBlockAlign,
-  updateBlockType,
-} from '@blocksuite/affine-block-note';
+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';
@@ -26,12 +23,8 @@ import {
 import {
   EmbedLinkedDocBlockSchema,
   EmbedSyncedDocBlockSchema,
-  type TextAlign,
 } from '@blocksuite/affine-model';
-import {
-  textAlignConfigs,
-  textConversionConfigs,
-} from '@blocksuite/affine-rich-text';
+import { textConversionConfigs } from '@blocksuite/affine-rich-text';
 import {
   copySelectedModelsCommand,
   deleteSelectedModelsCommand,
@@ -53,7 +46,6 @@ import {
   ActionPlacement,
   blockCommentToolbarButton,
 } from '@blocksuite/affine-shared/services';
-import { getMostCommonValue } from '@blocksuite/affine-shared/utils';
 import { tableViewMeta } from '@blocksuite/data-view/view-presets';
 import {
   CopyIcon,
@@ -138,64 +130,6 @@ const conversionsActionGroup = {
   },
 } as const satisfies ToolbarActionGenerator;
 
-const alignActionGroup = {
-  id: 'b.align',
-  when: ({ chain }) => isFormatSupported(chain).run()[0],
-  generate({ chain }) {
-    const [ok, { selectedModels = [] }] = chain
-      .tryAll(chain => [
-        chain.pipe(getTextSelectionCommand),
-        chain.pipe(getBlockSelectionsCommand),
-      ])
-      .pipe(getSelectedModelsCommand, { types: ['text', 'block'] })
-      .run();
-    if (!ok) return null;
-
-    const alignment =
-      textAlignConfigs.find(
-        ({ textAlign }) =>
-          textAlign ===
-          getMostCommonValue(
-            selectedModels.map(
-              ({ props }) => props as { textAlign?: TextAlign }
-            ),
-            'textAlign'
-          )
-      ) ?? textAlignConfigs[0];
-    const update = (textAlign: TextAlign) => {
-      chain.pipe(updateBlockAlign, { textAlign }).run();
-    };
-
-    return {
-      content: html`
-        <editor-menu-button
-          .contentPadding="${'8px'}"
-          .button=${html`
-            <editor-icon-button aria-label="Align" .tooltip="${'Align'}">
-              ${alignment.icon} ${EditorChevronDown}
-            </editor-icon-button>
-          `}
-        >
-          <div data-size="large" data-orientation="vertical">
-            ${repeat(
-              textAlignConfigs,
-              item => item.name,
-              ({ textAlign, name, icon }) => html`
-                <editor-menu-action
-                  aria-label=${name}
-                  @click=${() => update(textAlign)}
-                >
-                  ${icon}<span class="label">${name}</span>
-                </editor-menu-action>
-              `
-            )}
-          </div>
-        </editor-menu-button>
-      `,
-    };
-  },
-} as const satisfies ToolbarActionGenerator;
-
 const inlineTextActionGroup = {
   id: 'b.inline-text',
   when: ({ chain }) => isFormatSupported(chain).run()[0],
@@ -357,7 +291,6 @@ const turnIntoLinkedDoc = {
 export const builtinToolbarConfig = {
   actions: [
     conversionsActionGroup,
-    alignActionGroup,
     inlineTextActionGroup,
     highlightActionGroup,
     turnIntoDatabase,

blocksuite/affine/blocks/surface-ref/package.json

@@ -19,7 +19,7 @@
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/affine-widget-slash-menu": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@floating-ui/dom": "^1.6.13",

blocksuite/affine/blocks/table/package.json

@@ -20,7 +20,7 @@
     "@blocksuite/affine-widget-slash-menu": "workspace:*",
     "@blocksuite/data-view": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@emotion/css": "^11.13.5",

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

@@ -144,16 +144,6 @@ export class TableBlockComponent extends CaptionedBlockComponent<TableBlockModel
           style=${styleMap({
             paddingLeft: `${virtualPadding}px`,
             paddingRight: `${virtualPadding}px`,
-            marginLeft:
-              !this.model.props.textAlign$.value ||
-              this.model.props.textAlign$?.value === 'left'
-                ? undefined
-                : 'auto',
-            marginRight:
-              !this.model.props.textAlign$.value ||
-              this.model.props.textAlign$?.value === 'right'
-                ? undefined
-                : 'auto',
             width: 'max-content',
           })}
         >

blocksuite/affine/components/package.json

@@ -13,7 +13,7 @@
     "@blocksuite/affine-model": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@blocksuite/sync": "workspace:*",

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

@@ -193,7 +193,6 @@ export const menuButtonItems = {
     (config: {
       name: string;
       label?: () => TemplateResult;
-      info?: TemplateResult;
       prefix?: TemplateResult;
       postfix?: TemplateResult;
       isSelected?: boolean;
@@ -212,7 +211,7 @@ export const menuButtonItems = {
           return html`
             ${config.prefix}
             <div class="affine-menu-action-text">
-              ${config.label?.() ?? config.name} ${config.info}
+              ${config.label?.() ?? config.name}
             </div>
             ${config.postfix ?? (config.isSelected ? DoneIcon() : undefined)}
           `;

blocksuite/affine/data-view/package.json

@@ -13,7 +13,7 @@
     "@blocksuite/affine-components": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@emotion/css": "^11.13.5",

blocksuite/affine/foundation/package.json

@@ -16,7 +16,7 @@
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/data-view": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@floating-ui/dom": "^1.6.13",

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

@@ -15,7 +15,7 @@
     "@blocksuite/affine-model": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@floating-ui/dom": "^1.6.13",

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

@@ -18,7 +18,7 @@
     "@blocksuite/affine-rich-text": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@floating-ui/dom": "^1.6.13",

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

@@ -20,15 +20,14 @@ const DOC_BLOCK_CHILD_PADDING = 24;
 export class DocTitle extends WithDisposable(ShadowlessElement) {
   static override styles = css`
     .doc-title-container {
+      box-sizing: border-box;
+      font-family: var(--affine-font-family);
+      font-size: var(--affine-font-base);
+      line-height: var(--affine-line-height);
+      color: var(--affine-text-primary-color);
       font-size: 40px;
       line-height: 50px;
       font-weight: 700;
-    }
-    .doc-icon-container,
-    .doc-title-container {
-      box-sizing: border-box;
-      font-family: var(--affine-font-family);
-      color: var(--affine-text-primary-color);
       outline: none;
       resize: none;
       border: 0;
@@ -47,14 +46,9 @@ export class DocTitle extends WithDisposable(ShadowlessElement) {
         ${DOC_BLOCK_CHILD_PADDING}px
       );
     }
-    .doc-icon-container + * .doc-title-container {
-      /* when doc icon exists, remove the top padding */
-      padding-top: 0;
-    }
 
     /* Extra small devices (phones, 640px and down) */
     @container viewport (width <= 640px) {
-      .doc-icon-container,
       .doc-title-container {
         padding-left: ${DOC_BLOCK_CHILD_PADDING}px;
         padding-right: ${DOC_BLOCK_CHILD_PADDING}px;

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

@@ -18,7 +18,7 @@
     "@blocksuite/affine-rich-text": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@floating-ui/dom": "^1.6.13",

blocksuite/affine/fragments/outline/package.json

@@ -18,7 +18,7 @@
     "@blocksuite/affine-rich-text": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@floating-ui/dom": "^1.6.13",

blocksuite/affine/gfx/brush/package.json

@@ -18,7 +18,7 @@
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@lit/context": "^1.1.2",

blocksuite/affine/gfx/connector/package.json

@@ -19,7 +19,7 @@
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@lit/context": "^1.1.2",

blocksuite/affine/gfx/group/package.json

@@ -19,7 +19,7 @@
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@lit/context": "^1.1.2",

blocksuite/affine/gfx/link/package.json

@@ -21,7 +21,7 @@
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@lit/context": "^1.1.2",

blocksuite/affine/gfx/mindmap/package.json

@@ -25,7 +25,7 @@
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@lit/context": "^1.1.2",

blocksuite/affine/gfx/note/package.json

@@ -21,7 +21,7 @@
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@lit/context": "^1.1.2",

blocksuite/affine/gfx/pointer/package.json

@@ -18,7 +18,7 @@
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@lit/context": "^1.1.2",

blocksuite/affine/gfx/shape/package.json

@@ -19,7 +19,7 @@
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@lit/context": "^1.1.2",

blocksuite/affine/gfx/template/package.json

@@ -19,7 +19,7 @@
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@floating-ui/dom": "^1.6.13",

blocksuite/affine/gfx/text/package.json

@@ -18,7 +18,7 @@
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@lit/context": "^1.1.2",

blocksuite/affine/inlines/footnote/package.json

@@ -16,7 +16,7 @@
     "@blocksuite/affine-model": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@floating-ui/dom": "^1.6.13",

blocksuite/affine/inlines/latex/package.json

@@ -17,7 +17,7 @@
     "@blocksuite/affine-rich-text": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@floating-ui/dom": "^1.6.13",

blocksuite/affine/inlines/link/package.json

@@ -16,7 +16,7 @@
     "@blocksuite/affine-model": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@floating-ui/dom": "^1.6.13",

blocksuite/affine/inlines/mention/package.json

@@ -15,7 +15,7 @@
     "@blocksuite/affine-model": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@floating-ui/dom": "^1.6.13",

blocksuite/affine/inlines/preset/package.json

@@ -22,7 +22,7 @@
     "@blocksuite/affine-rich-text": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@floating-ui/dom": "^1.6.13",

blocksuite/affine/inlines/reference/package.json

@@ -15,7 +15,7 @@
     "@blocksuite/affine-model": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@floating-ui/dom": "^1.6.13",

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

@@ -1,4 +1,3 @@
-import type { IconData } from '@blocksuite/affine-shared/services';
 import {
   BlockModel,
   BlockSchemaExtension,
@@ -9,17 +8,15 @@ import {
 import type { BlockMeta } from '../../utils/types';
 
 export type CalloutProps = {
-  icon?: IconData;
+  emoji: string;
   text: Text;
-  backgroundColorName?: string;
 } & BlockMeta;
 
 export const CalloutBlockSchema = defineBlockSchema({
   flavour: 'affine:callout',
   props: (internal): CalloutProps => ({
-    icon: { type: 'emoji', unicode: '💡' } as IconData,
+    emoji: '😀',
     text: internal.Text(),
-    backgroundColorName: 'grey',
     'meta:createdAt': undefined,
     'meta:updatedAt': undefined,
     'meta:createdBy': undefined,

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

@@ -9,7 +9,6 @@ import {
   defineBlockSchema,
 } from '@blocksuite/store';
 
-import type { TextAlign } from '../../consts';
 import type { BlockMeta } from '../../utils/types.js';
 import { ImageBlockTransformer } from './image-transformer.js';
 
@@ -21,7 +20,6 @@ export type ImageBlockProps = {
   rotate: number;
   size?: number;
   comments?: Record<string, boolean>;
-  textAlign?: TextAlign;
 } & Omit<GfxCommonBlockProps, 'scale'> &
   BlockMeta;
 
@@ -36,7 +34,6 @@ const defaultImageProps: ImageBlockProps = {
   rotate: 0,
   size: -1,
   comments: undefined,
-  textAlign: undefined,
   'meta:createdAt': undefined,
   'meta:createdBy': undefined,
   'meta:updatedAt': undefined,

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

@@ -5,7 +5,6 @@ import {
   defineBlockSchema,
 } from '@blocksuite/store';
 
-import type { TextAlign } from '../../consts';
 import type { BlockMeta } from '../../utils/types';
 
 // `toggle` type has been deprecated, do not use it
@@ -14,7 +13,6 @@ export type ListType = 'bulleted' | 'numbered' | 'todo' | 'toggle';
 export type ListProps = {
   type: ListType;
   text: Text;
-  textAlign?: TextAlign;
   checked: boolean;
   collapsed: boolean;
   order: number | null;
@@ -27,7 +25,6 @@ export const ListBlockSchema = defineBlockSchema({
     ({
       type: 'bulleted',
       text: internal.Text(),
-      textAlign: undefined,
       checked: false,
       collapsed: false,
 

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

@@ -5,7 +5,6 @@ import {
   type Text,
 } from '@blocksuite/store';
 
-import type { TextAlign } from '../../consts';
 import type { BlockMeta } from '../../utils/types';
 
 export type ParagraphType =
@@ -20,7 +19,6 @@ export type ParagraphType =
 
 export type ParagraphProps = {
   type: ParagraphType;
-  textAlign?: TextAlign;
   text: Text;
   collapsed: boolean;
   comments?: Record<string, boolean>;
@@ -31,7 +29,6 @@ export const ParagraphBlockSchema = defineBlockSchema({
   props: (internal): ParagraphProps => ({
     type: 'text',
     text: internal.Text(),
-    textAlign: undefined,
     collapsed: false,
     comments: undefined,
     'meta:createdAt': undefined,

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

@@ -5,7 +5,6 @@ import {
   defineBlockSchema,
 } from '@blocksuite/store';
 
-import type { TextAlign } from '../../consts';
 import type { BlockMeta } from '../../utils/types';
 
 export type TableCell = {
@@ -31,7 +30,6 @@ export interface TableBlockProps extends BlockMeta {
   // key = `${rowId}:${columnId}`
   cells: Record<string, TableCell>;
   comments?: Record<string, boolean>;
-  textAlign?: TextAlign;
 }
 
 export interface TableCellSerialized {
@@ -55,7 +53,6 @@ export const TableBlockSchema = defineBlockSchema({
     columns: {},
     cells: {},
     comments: undefined,
-    textAlign: undefined,
     'meta:createdAt': undefined,
     'meta:createdBy': undefined,
     'meta:updatedAt': undefined,

blocksuite/affine/rich-text/package.json

@@ -14,7 +14,7 @@
     "@blocksuite/affine-model": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@floating-ui/dom": "^1.6.13",

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

@@ -1,35 +0,0 @@
-import { TextAlign } from '@blocksuite/affine-model';
-import {
-  TextAlignCenterIcon,
-  TextAlignLeftIcon,
-  TextAlignRightIcon,
-} from '@blocksuite/icons/lit';
-import type { TemplateResult } from 'lit';
-
-export interface TextAlignConfig {
-  textAlign: TextAlign;
-  name: string;
-  hotkey: string[] | null;
-  icon: TemplateResult<1>;
-}
-
-export const textAlignConfigs: TextAlignConfig[] = [
-  {
-    textAlign: TextAlign.Left,
-    name: 'Align left',
-    hotkey: [`Mod-Shift-L`],
-    icon: TextAlignLeftIcon(),
-  },
-  {
-    textAlign: TextAlign.Center,
-    name: 'Align center',
-    hotkey: [`Mod-Shift-E`],
-    icon: TextAlignCenterIcon(),
-  },
-  {
-    textAlign: TextAlign.Right,
-    name: 'Align right',
-    hotkey: [`Mod-Shift-R`],
-    icon: TextAlignRightIcon(),
-  },
-];

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

@@ -1,4 +1,3 @@
-export { type TextAlignConfig, textAlignConfigs } from './align';
 export { type TextConversionConfig, textConversionConfigs } from './conversion';
 export {
   asyncGetRichText,

blocksuite/affine/shared/package.json

@@ -12,7 +12,7 @@
   "dependencies": {
     "@blocksuite/affine-model": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@floating-ui/dom": "^1.6.13",

blocksuite/affine/shared/src/services/icon-picker-service.ts

@@ -1 +0,0 @@
-export * from './icon-picker-service/index.js';

blocksuite/affine/shared/src/services/icon-picker-service/index.ts

@@ -1,29 +0,0 @@
-import type { UniComponent } from '@blocksuite/affine-shared/types';
-import { createIdentifier } from '@blocksuite/global/di';
-export enum IconType {
-  Emoji = 'emoji',
-  AffineIcon = 'affine-icon',
-  Blob = 'blob',
-}
-
-export type IconData =
-  | {
-      type: IconType.Emoji;
-      unicode: string;
-    }
-  | {
-      type: IconType.AffineIcon;
-      name: string;
-      color: string;
-    }
-  | {
-      type: IconType.Blob;
-      blob: Blob;
-    };
-
-export interface IconPickerService {
-  iconPickerComponent: UniComponent<{ onSelect?: (data?: IconData) => void }>;
-}
-
-export const IconPickerServiceIdentifier =
-  createIdentifier<IconPickerService>('IconPickerService');

blocksuite/affine/shared/src/services/index.ts

@@ -13,7 +13,6 @@ export * from './feature-flag-service';
 export * from './file-size-limit-service';
 export * from './font-loader';
 export * from './generate-url-service';
-export * from './icon-picker-service';
 export * from './link-preview-service';
 export * from './native-clipboard-service';
 export * from './notification-service';

blocksuite/affine/widgets/drag-handle/package.json

@@ -21,7 +21,7 @@
     "@blocksuite/affine-model": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@floating-ui/dom": "^1.6.13",

blocksuite/affine/widgets/edgeless-auto-connect/package.json

@@ -17,7 +17,7 @@
     "@blocksuite/affine-model": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@preact/signals-core": "^1.8.0",
     "@toeverything/theme": "^1.1.16",

blocksuite/affine/widgets/edgeless-dragging-area/package.json

@@ -17,7 +17,7 @@
     "@blocksuite/affine-model": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",

blocksuite/affine/widgets/edgeless-selected-rect/package.json

@@ -21,7 +21,7 @@
     "@blocksuite/affine-model": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",

blocksuite/affine/widgets/edgeless-toolbar/package.json

@@ -17,7 +17,7 @@
     "@blocksuite/affine-rich-text": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@floating-ui/dom": "^1.6.13",
     "@lit/context": "^1.1.2",

blocksuite/affine/widgets/edgeless-zoom-toolbar/package.json

@@ -16,7 +16,7 @@
     "@blocksuite/affine-model": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@floating-ui/dom": "^1.6.13",
     "@preact/signals-core": "^1.8.0",

blocksuite/affine/widgets/keyboard-toolbar/package.json

@@ -33,7 +33,7 @@
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/data-view": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@lit/context": "^1.1.2",

blocksuite/affine/widgets/linked-doc/package.json

@@ -18,7 +18,7 @@
     "@blocksuite/affine-rich-text": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@lit/context": "^1.1.2",

blocksuite/affine/widgets/linked-doc/src/styles.ts

@@ -76,16 +76,10 @@ export const linkedDocPopoverStyles = css`
     border-top: 0.5px solid ${unsafeCSSVarV2('layer/insideBorder/border')};
   }
 
-  .group icon-button svg,
-  .group icon-button .icon {
+  .group icon-button svg {
     width: 20px;
     height: 20px;
   }
-  .group icon-button .icon {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
 
   .linked-doc-popover .group {
     display: flex;

blocksuite/affine/widgets/note-slicer/package.json

@@ -18,7 +18,7 @@
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/affine-widget-edgeless-selected-rect": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@lit/context": "^1.1.2",
     "@preact/signals-core": "^1.8.0",

blocksuite/affine/widgets/page-dragging-area/package.json

@@ -15,7 +15,7 @@
     "@blocksuite/affine-model": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@lit/context": "^1.1.2",

blocksuite/affine/widgets/remote-selection/package.json

@@ -16,7 +16,7 @@
     "@blocksuite/affine-model": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@preact/signals-core": "^1.8.0",
     "@toeverything/theme": "^1.1.16",

blocksuite/affine/widgets/slash-menu/package.json

@@ -15,7 +15,7 @@
     "@blocksuite/affine-rich-text": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@floating-ui/dom": "^1.6.13",

blocksuite/affine/widgets/toolbar/package.json

@@ -18,7 +18,7 @@
     "@blocksuite/affine-model": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@floating-ui/dom": "^1.6.13",
     "@preact/signals-core": "^1.8.0",

blocksuite/affine/widgets/viewport-overlay/package.json

@@ -15,7 +15,7 @@
     "@blocksuite/affine-model": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/std": "workspace:*",
     "@floating-ui/dom": "^1.6.13",
     "@preact/signals-core": "^1.8.0",

blocksuite/framework/store/src/__tests__/block.unit.spec.ts

@@ -51,7 +51,6 @@ const flatTableSchema = defineBlockSchema({
     textCols: {} as Record<string, Text>,
     rows: {} as Record<string, { color: string }>,
     labels: [] as Array<string>,
-    optional: undefined as string | undefined,
   }),
   metadata: {
     role: 'content',
@@ -495,16 +494,6 @@ describe('flat', () => {
     expect(model.props.textCols$.value.a.toDelta()).toEqual([
       { insert: 'test' },
     ]);
-
-    onChange.mockClear();
-    expect(model.props).not.toHaveProperty('optional');
-    expect(model.props).toHaveProperty('optional$');
-    model.props.optional$.value = 'test';
-    expect(model.props.optional).toBe('test');
-    expect(model.props.optional$.value).toBe('test');
-    expect(onChange).toHaveBeenCalledTimes(1);
-    expect(onChange).toHaveBeenCalledWith(expect.anything(), 'optional', true);
-    expect(yBlock.get('prop:optional')).toBe('test');
   });
 
   test('stash and pop', () => {

blocksuite/framework/store/src/model/block/flat-sync-controller.ts

@@ -47,7 +47,6 @@ export class FlatSyncController {
     }
 
     const model = schema.model.toModel?.() ?? new BlockModel<object>();
-    const defaultProps = schema.model.props?.(internalPrimitives);
     model.schema = schema;
 
     model.id = this.id;
@@ -56,8 +55,7 @@ export class FlatSyncController {
     const reactive = new ReactiveFlatYMap(
       this.yBlock,
       model.deleted,
-      this.onChange,
-      defaultProps
+      this.onChange
     );
     this._reactive = reactive;
     const proxy = reactive.proxy;
@@ -68,6 +66,17 @@ export class FlatSyncController {
       model.store = this.doc;
     }
 
+    const defaultProps = schema.model.props?.(internalPrimitives);
+    if (defaultProps) {
+      Object.entries(defaultProps).forEach(([key, value]) => {
+        if (key in proxy) {
+          return;
+        }
+        if (value === undefined) return;
+        proxy[key] = value;
+      });
+    }
+
     return model;
   }
 

blocksuite/framework/store/src/reactive/flat-native-y/index.ts

@@ -99,8 +99,7 @@ export class ReactiveFlatYMap extends BaseReactiveYData<
   constructor(
     protected readonly _ySource: YMap<unknown>,
     private readonly _onDispose: Subject<void>,
-    private readonly _onChange?: OnChange,
-    defaultProps?: Record<string, unknown>
+    private readonly _onChange?: OnChange
   ) {
     super();
     this._initialized = false;
@@ -113,7 +112,7 @@ export class ReactiveFlatYMap extends BaseReactiveYData<
 
     const proxy = this._getProxy(source, source);
 
-    const initSignals = (key: string, value: unknown) => {
+    Object.entries(source).forEach(([key, value]) => {
       const signalData = signal(value);
       source[`${key}$`] = signalData;
       const unsubscribe = signalData.subscribe(next => {
@@ -129,30 +128,11 @@ export class ReactiveFlatYMap extends BaseReactiveYData<
         subscription.unsubscribe();
         unsubscribe();
       });
-    };
-
-    Object.entries(source).forEach(([key, value]) => {
-      initSignals(key, value);
     });
 
-    if (defaultProps) {
-      Object.entries(defaultProps).forEach(([key, value]) => {
-        if (!(key in proxy) && value === undefined) {
-          initSignals(key, value);
-        }
-      });
-    }
-
     this._proxy = proxy;
     this._ySource.observe(this._observer);
     this._initialized = true;
-
-    if (defaultProps) {
-      Object.entries(defaultProps).forEach(([key, value]) => {
-        if (key in proxy || value === undefined) return;
-        proxy[key] = value;
-      });
-    }
   }
 
   pop = (prop: string): void => {

blocksuite/integration-test/package.json

@@ -14,7 +14,7 @@
   "license": "MIT",
   "dependencies": {
     "@blocksuite/affine": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@floating-ui/dom": "^1.6.13",
     "@lit/context": "^1.1.3",
     "@lottiefiles/dotlottie-wc": "^0.5.0",

blocksuite/playground/package.json

@@ -14,7 +14,7 @@
     "@blocksuite/affine-model": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/data-view": "workspace:*",
-    "@blocksuite/icons": "^2.2.17",
+    "@blocksuite/icons": "^2.2.12",
     "@blocksuite/integration-test": "workspace:*",
     "@preact/signals-core": "^1.8.0",
     "@shoelace-style/shoelace": "2.20.1",