chore: enable webview debugging for Android

fix(core): infinitied loop
2026-07-02 18:20:39 +08:00 · 2025-10-02 21:48:29 +08:00 · 2025-09-26 15:48:24 +08:00
421 changed files with 1529 additions and 45940 deletions
@@ -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": {}
        }
      }
    },
@@ -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**

@@ -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",
@@ -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",
@@ -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",
@@ -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: '10px',
-  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',
-});
@@ -1,159 +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 } from '@blocksuite/affine-model';
-import { focusTextModel } from '@blocksuite/affine-rich-text';
 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 _closeIconPicker() {
-    if (this._popupCloseHandler) {
-      this._popupCloseHandler();
-      this._popupCloseHandler = null;
-    }
-  }
-
-  private _toggleIconPicker(event: MouseEvent) {
-    // If popup is already open, close it
-    if (this._popupCloseHandler) {
-      this._closeIconPicker();
-      return;
+  static override styles = css`
+    :host {
+      display: block;
+      margin: 8px 0;
    }

-    // Get IconPickerService from the framework
-    const iconPickerService = this.std.getOptional(IconPickerServiceIdentifier);
-    if (!iconPickerService) {
-      console.warn('IconPickerService not found');
-      return;
+    .affine-callout-block-container {
+      display: flex;
+      padding: 5px 10px;
+      border-radius: 8px;
+      background-color: ${unsafeCSSVarV2('block/callout/background/grey')};
    }

-    // Get the uni-component from the service
-    const iconPickerComponent = iconPickerService.iconPickerComponent;
+    .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;
+    }
+    .affine-callout-emoji:hover {
+      cursor: pointer;
+      opacity: 0.7;
+    }

-    // Create props for the icon picker
-    const props = {
-      onSelect: (iconData?: IconData) => {
-        this.model.props.icon$.value = iconData;
-        this._closeIconPicker(); // Close the picker after selection
+    .affine-callout-children {
+      flex: 1;
+      min-width: 0;
+      padding-left: 10px;
+    }
+  `;
+
+  private _emojiMenuAbortController: AbortController | null = null;
+  private readonly _toggleEmojiMenu = () => {
+    if (this._emojiMenuAbortController) {
+      this._emojiMenuAbortController.abort();
+    }
+    this._emojiMenuAbortController = new AbortController();
+
+    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() {
@@ -172,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>(
@@ -182,36 +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}"
-              >
-                <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>
@@ -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,
@@ -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 });
-};
@@ -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();
-};
@@ -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',
@@ -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,
-    }),
-  ];
-};
@@ -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;
  }
 }
@@ -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>`;
+  }
+}
@@ -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;
-  }
-}
@@ -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'),
    ]);
  }
 }
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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,
    },
    {
@@ -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
@@ -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",
@@ -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",
@@ -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,
@@ -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",
@@ -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';
@@ -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 === null) {
-    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();
-};
@@ -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']
@@ -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);

@@ -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
@@ -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",
@@ -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,
@@ -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",
@@ -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",
@@ -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',
          })}
        >
@@ -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:*",
@@ -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)}
          `;
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -19,7 +19,6 @@ const DOC_BLOCK_CHILD_PADDING = 24;

 export class DocTitle extends WithDisposable(ShadowlessElement) {
  static override styles = css`
-    .doc-icon-container,
    .doc-title-container {
      box-sizing: border-box;
      font-family: var(--affine-font-family);
@@ -50,7 +49,6 @@ export class DocTitle extends WithDisposable(ShadowlessElement) {

    /* 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;
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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,
@@ -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,
@@ -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,

@@ -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,
@@ -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,
@@ -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",
@@ -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(),
-  },
-];
@@ -1,4 +1,3 @@
-export { type TextAlignConfig, textAlignConfigs } from './align';
 export { type TextConversionConfig, textConversionConfigs } from './conversion';
 export {
  asyncGetRichText,
@@ -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",
@@ -1 +0,0 @@
-export * from './icon-picker-service/index.js';
@@ -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');
@@ -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';
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -53,7 +53,7 @@
    "@affine-tools/cli": "workspace:*",
    "@capacitor/cli": "^7.0.0",
    "@eslint/js": "^9.16.0",
-    "@faker-js/faker": "^10.0.0",
+    "@faker-js/faker": "^9.3.0",
    "@istanbuljs/schema": "^0.1.3",
    "@magic-works/i18n-codegen": "^0.6.1",
    "@playwright/test": "=1.52.0",
@@ -82,7 +82,7 @@
    "husky": "^9.1.7",
    "lint-staged": "^16.0.0",
    "msw": "^2.6.8",
-    "oxlint": "~1.18.0",
+    "oxlint": "^1.15.0",
    "prettier": "^3.4.2",
    "semver": "^7.6.3",
    "serve": "^14.2.4",
@@ -1,12 +0,0 @@
-- CreateEnum
-CREATE TYPE "Provider" AS ENUM ('stripe', 'revenuecat');
-
-- CreateEnum
-CREATE TYPE "IapStore" AS ENUM ('app_store', 'play_store');
-
-- AlterTable
-ALTER TABLE "subscriptions" ADD COLUMN     "iap_store" "IapStore",
-ADD COLUMN     "provider" "Provider" NOT NULL DEFAULT 'stripe',
-ADD COLUMN     "rc_entitlement" VARCHAR,
-ADD COLUMN     "rc_external_ref" VARCHAR,
-ADD COLUMN     "rc_product_id" VARCHAR;
@@ -127,8 +127,7 @@
    "@affine-tools/cli": "workspace:*",
    "@affine-tools/utils": "workspace:*",
    "@affine/graphql": "workspace:*",
-    "@faker-js/faker": "^10.0.0",
-    "@nestjs/swagger": "^11.2.0",
+    "@faker-js/faker": "^9.6.0",
    "@nestjs/testing": "patch:@nestjs/testing@npm%3A10.4.15#~/.yarn/patches/@nestjs-testing-npm-10.4.15-d591a1705a.patch",
    "@types/cookie-parser": "^1.4.8",
    "@types/express": "^5.0.1",
@@ -749,16 +749,6 @@ model Subscription {
  stripeSubscriptionId String?   @unique @map("stripe_subscription_id")
  // stripe schedule id
  stripeScheduleId     String?   @map("stripe_schedule_id") @db.VarChar
-  // subscription provider: stripe or revenuecat
-  provider             Provider  @default(stripe)
-  // iap store for revenuecat subscriptions
-  iapStore             IapStore? @map("iap_store")
-  // revenuecat entitlement name like "Pro" / "AI"
-  rcEntitlement        String?   @map("rc_entitlement") @db.VarChar
-  // revenuecat product id like "app.affine.pro.Annual"
-  rcProductId          String?   @map("rc_product_id") @db.VarChar
-  // external reference, appstore originalTransactionId or play purchaseToken
-  rcExternalRef        String?   @map("rc_external_ref") @db.VarChar
  // subscription.status, active/past_due/canceled/unpaid...
  status               String    @db.VarChar(20)
  // subscription.current_period_start
@@ -780,16 +770,6 @@ model Subscription {
  @@map("subscriptions")
 }

-enum Provider {
-  stripe
-  revenuecat
-}
-
-enum IapStore {
-  app_store
-  play_store
-}
-
 model Invoice {
  stripeInvoiceId             String   @id @map("stripe_invoice_id")
  targetId                    String   @map("target_id") @db.VarChar
@@ -444,37 +444,3 @@ Generated by [AVA](https://avajs.dev).
        },
      ],
    }
-
-## should resolve model correctly based on subscription status and prompt config
-
-> should honor requested pro model
-
-    'gemini-2.5-pro'
-
-> should fallback to default model
-
-    'gemini-2.5-flash'
-
-> should fallback to default model when requesting pro model during trialing
-
-    'gemini-2.5-flash'
-
-> should honor requested non-pro model during trialing
-
-    'gemini-2.5-flash'
-
-> should pick default model when no requested model during trialing
-
-    'gemini-2.5-flash'
-
-> should pick default model when no requested model during active
-
-    'gemini-2.5-flash'
-
-> should honor requested pro model during active
-
-    'claude-sonnet-4-5@20250929'
-
-> should fallback to default model when requesting non-optional model during active
-
-    'gemini-2.5-flash'
@@ -60,9 +60,6 @@ import {
 import { AutoRegisteredWorkflowExecutor } from '../plugins/copilot/workflow/executor/utils';
 import { WorkflowGraphList } from '../plugins/copilot/workflow/graph';
 import { CopilotWorkspaceService } from '../plugins/copilot/workspace';
-import { PaymentModule } from '../plugins/payment';
-import { SubscriptionService } from '../plugins/payment/service';
-import { SubscriptionStatus } from '../plugins/payment/types';
 import { MockCopilotProvider } from './mocks';
 import { createTestingModule, TestingModule } from './utils';
 import { WorkflowTestCases } from './utils/copilot';
@@ -85,7 +82,6 @@ type Context = {
  storage: CopilotStorage;
  workflow: CopilotWorkflowService;
  cronJobs: CopilotCronJobs;
-  subscription: SubscriptionService;
  executors: {
    image: CopilotChatImageExecutor;
    text: CopilotChatTextExecutor;
@@ -120,7 +116,6 @@ test.before(async t => {
          },
        },
      }),
-      PaymentModule,
      QuotaModule,
      StorageModule,
      CopilotModule,
@@ -129,13 +124,6 @@ test.before(async t => {
      // use real JobQueue for testing
      builder.overrideProvider(JobQueue).useClass(JobQueue);
      builder.overrideProvider(OpenAIProvider).useClass(MockCopilotProvider);
-      builder.overrideProvider(SubscriptionService).useClass(
-        class {
-          select() {
-            return { getSubscription: async () => undefined };
-          }
-        }
-      );
    },
  });

@@ -157,7 +145,6 @@ test.before(async t => {
  const transcript = module.get(CopilotTranscriptionService);
  const workspaceEmbedding = module.get(CopilotWorkspaceService);
  const cronJobs = module.get(CopilotCronJobs);
-  const subscription = module.get(SubscriptionService);

  t.context.module = module;
  t.context.auth = auth;
@@ -176,7 +163,6 @@ test.before(async t => {
  t.context.transcript = transcript;
  t.context.workspaceEmbedding = workspaceEmbedding;
  t.context.cronJobs = cronJobs;
-  t.context.subscription = subscription;

  t.context.executors = {
    image: module.get(CopilotChatImageExecutor),
@@ -2061,90 +2047,3 @@ test('should handle copilot cron jobs correctly', async t => {
  toBeGenerateStub.restore();
  jobAddStub.restore();
 });
-
-test('should resolve model correctly based on subscription status and prompt config', async t => {
-  const { db, session, subscription } = t.context;
-
-  // 1) Seed a prompt that has optionalModels and proModels in config
-  const promptName = 'resolve-model-test';
-  await db.aiPrompt.create({
-    data: {
-      name: promptName,
-      model: 'gemini-2.5-flash',
-      messages: {
-        create: [{ idx: 0, role: 'system', content: 'test' }],
-      },
-      config: { proModels: ['gemini-2.5-pro', 'claude-sonnet-4-5@20250929'] },
-      optionalModels: [
-        'gemini-2.5-flash',
-        'gemini-2.5-pro',
-        'claude-sonnet-4-5@20250929',
-      ],
-    },
-  });
-
-  // 2) Create a chat session with this prompt
-  const sessionId = await session.create({
-    promptName,
-    docId: 'test',
-    workspaceId: 'test',
-    userId,
-    pinned: false,
-  });
-  const s = (await session.get(sessionId))!;
-
-  const mockStatus = (status?: SubscriptionStatus) => {
-    Sinon.restore();
-    Sinon.stub(subscription, 'select').callsFake(() => ({
-      // @ts-expect-error mock
-      getSubscription: async () => (status ? { status } : null),
-    }));
-  };
-
-  // payment disabled -> allow requested if in optional; pro not blocked
-  {
-    const model1 = await s.resolveModel(false, 'gemini-2.5-pro');
-    t.snapshot(model1, 'should honor requested pro model');
-
-    const model2 = await s.resolveModel(false, 'not-in-optional');
-    t.snapshot(model2, 'should fallback to default model');
-  }
-
-  // payment enabled + trialing: requesting pro should fallback to default
-  {
-    mockStatus(SubscriptionStatus.Trialing);
-    const model3 = await s.resolveModel(true, 'gemini-2.5-pro');
-    t.snapshot(
-      model3,
-      'should fallback to default model when requesting pro model during trialing'
-    );
-
-    const model4 = await s.resolveModel(true, 'gemini-2.5-flash');
-    t.snapshot(model4, 'should honor requested non-pro model during trialing');
-
-    const model5 = await s.resolveModel(true);
-    t.snapshot(
-      model5,
-      'should pick default model when no requested model during trialing'
-    );
-  }
-
-  // payment enabled + active: without requested -> default model; requested pro should be honored
-  {
-    mockStatus(SubscriptionStatus.Active);
-    const model6 = await s.resolveModel(true);
-    t.snapshot(
-      model6,
-      'should pick default model when no requested model during active'
-    );
-
-    const model7 = await s.resolveModel(true, 'claude-sonnet-4-5@20250929');
-    t.snapshot(model7, 'should honor requested pro model during active');
-
-    const model8 = await s.resolveModel(true, 'not-in-optional');
-    t.snapshot(
-      model8,
-      'should fallback to default model when requesting non-optional model during active'
-    );
-  }
-});
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
L-Sun	ac76e5b949	chore: enable webview debugging for Android	2025-10-02 21:48:29 +08:00
L-Sun	0bc1005b96	fix(core): infinitied loop	2025-09-26 15:48:24 +08:00
				`@@ -1 +0,0 @@`
				`export * from './icon-picker-service/index.js';`