feat(component): sortable

.devcontainer/devcontainer.json

@@ -6,7 +6,7 @@
   "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
   "features": {
     "ghcr.io/devcontainers/features/node:1": {
-      "version": "22"
+      "version": "18"
     },
     "ghcr.io/devcontainers/features/rust:1": {}
   },

.docker/selfhost/config.example.json

@@ -1,6 +0,0 @@
-{
-  "schema": "https://github.com/toeverything/affine/releases/latest/download/config.schema.json",
-  "server": {
-    "name": "AFFiNE Self Hosted Server"
-  }
-}

.docker/selfhost/schema.json

@@ -3,6 +3,42 @@
   "title": "AFFiNE Application Configuration",
   "type": "object",
   "properties": {
+    "redis": {
+      "type": "object",
+      "description": "Configuration for redis module",
+      "properties": {
+        "db": {
+          "type": "number",
+          "description": "The database index of redis server to be used(Must be less than 10).\n@default 0\n@environment `REDIS_DATABASE`",
+          "default": 0
+        },
+        "host": {
+          "type": "string",
+          "description": "The host of the redis server.\n@default \"localhost\"\n@environment `REDIS_HOST`",
+          "default": "localhost"
+        },
+        "port": {
+          "type": "number",
+          "description": "The port of the redis server.\n@default 6379\n@environment `REDIS_PORT`",
+          "default": 6379
+        },
+        "username": {
+          "type": "string",
+          "description": "The username of the redis server.\n@default \"\"\n@environment `REDIS_USERNAME`",
+          "default": ""
+        },
+        "password": {
+          "type": "string",
+          "description": "The password of the redis server.\n@default \"\"\n@environment `REDIS_PASSWORD`",
+          "default": ""
+        },
+        "ioredis": {
+          "type": "object",
+          "description": "The config for the ioredis client.\n@default {}\n@link https://github.com/luin/ioredis",
+          "default": {}
+        }
+      }
+    },
     "metrics": {
       "type": "object",
       "description": "Configuration for metrics module",
@@ -14,6 +50,25 @@
         }
       }
     },
+    "graphql": {
+      "type": "object",
+      "description": "Configuration for graphql module",
+      "properties": {
+        "apolloDriverConfig": {
+          "type": "object",
+          "description": "The config for underlying nestjs GraphQL and apollo driver engine.\n@default {\"buildSchemaOptions\":{\"numberScalarMode\":\"integer\"},\"useGlobalPrefix\":true,\"playground\":true,\"introspection\":true,\"sortSchema\":true}\n@link https://docs.nestjs.com/graphql/quick-start",
+          "default": {
+            "buildSchemaOptions": {
+              "numberScalarMode": "integer"
+            },
+            "useGlobalPrefix": true,
+            "playground": true,
+            "introspection": true,
+            "sortSchema": true
+          }
+        }
+      }
+    },
     "crypto": {
       "type": "object",
       "description": "Configuration for crypto module",
@@ -31,20 +86,25 @@
       "properties": {
         "queue": {
           "type": "object",
-          "description": "The config for job queues\n@default {\"attempts\":5,\"removeOnComplete\":true,\"removeOnFail\":{\"age\":86400,\"count\":500}}\n@link https://api.docs.bullmq.io/interfaces/v5.QueueOptions.html",
+          "description": "The config for job queues\n@default {\"prefix\":\"affine_job\",\"defaultJobOptions\":{\"attempts\":5,\"removeOnComplete\":true,\"removeOnFail\":{\"age\":86400,\"count\":500}}}\n@link https://api.docs.bullmq.io/interfaces/v5.QueueOptions.html",
           "default": {
-            "attempts": 5,
-            "removeOnComplete": true,
-            "removeOnFail": {
-              "age": 86400,
-              "count": 500
+            "prefix": "affine_job",
+            "defaultJobOptions": {
+              "attempts": 5,
+              "removeOnComplete": true,
+              "removeOnFail": {
+                "age": 86400,
+                "count": 500
+              }
             }
           }
         },
         "worker": {
           "type": "object",
-          "description": "The config for job workers\n@default {}\n@link https://api.docs.bullmq.io/interfaces/v5.WorkerOptions.html",
-          "default": {}
+          "description": "The config for job workers\n@default {\"defaultWorkerOptions\":{}}\n@link https://api.docs.bullmq.io/interfaces/v5.WorkerOptions.html",
+          "default": {
+            "defaultWorkerOptions": {}
+          }
         },
         "queues.copilot": {
           "type": "object",
@@ -149,6 +209,22 @@
         }
       }
     },
+    "db": {
+      "type": "object",
+      "description": "Configuration for db module",
+      "properties": {
+        "datasourceUrl": {
+          "type": "string",
+          "description": "The datasource url for the prisma client.\n@default \"postgresql://localhost:5432/affine\"\n@environment `DATABASE_URL`",
+          "default": "postgresql://localhost:5432/affine"
+        },
+        "prisma": {
+          "type": "object",
+          "description": "The config for the prisma client.\n@default {}\n@link https://www.prisma.io/docs/reference/api-reference/prisma-client-reference",
+          "default": {}
+        }
+      }
+    },
     "auth": {
       "type": "object",
       "description": "Configuration for auth module",
@@ -351,24 +427,6 @@
                     "accountId": {
                       "type": "string",
                       "description": "The account id for the cloudflare r2 storage provider."
-                    },
-                    "usePresignedURL": {
-                      "type": "object",
-                      "description": "The presigned url config for the cloudflare r2 storage provider.",
-                      "properties": {
-                        "enabled": {
-                          "type": "boolean",
-                          "description": "Whether to use presigned url for the cloudflare r2 storage provider."
-                        },
-                        "urlPrefix": {
-                          "type": "string",
-                          "description": "The presigned url prefix for the cloudflare r2 storage provider.\nsee https://developers.cloudflare.com/waf/custom-rules/use-cases/configure-token-authentication/ to configure it.\nExample value: \"https://storage.example.com\"\nExample rule: is_timed_hmac_valid_v0(\"your_secret\", http.request.uri, 10800, http.request.timestamp.sec, 6)"
-                        },
-                        "signKey": {
-                          "type": "string",
-                          "description": "The presigned key for the cloudflare r2 storage provider."
-                        }
-                      }
                     }
                   }
                 }
@@ -472,24 +530,6 @@
                     "accountId": {
                       "type": "string",
                       "description": "The account id for the cloudflare r2 storage provider."
-                    },
-                    "usePresignedURL": {
-                      "type": "object",
-                      "description": "The presigned url config for the cloudflare r2 storage provider.",
-                      "properties": {
-                        "enabled": {
-                          "type": "boolean",
-                          "description": "Whether to use presigned url for the cloudflare r2 storage provider."
-                        },
-                        "urlPrefix": {
-                          "type": "string",
-                          "description": "The presigned url prefix for the cloudflare r2 storage provider.\nsee https://developers.cloudflare.com/waf/custom-rules/use-cases/configure-token-authentication/ to configure it.\nExample value: \"https://storage.example.com\"\nExample rule: is_timed_hmac_valid_v0(\"your_secret\", http.request.uri, 10800, http.request.timestamp.sec, 6)"
-                        },
-                        "signKey": {
-                          "type": "string",
-                          "description": "The presigned key for the cloudflare r2 storage provider."
-                        }
-                      }
                     }
                   }
                 }
@@ -517,8 +557,8 @@
         },
         "externalUrl": {
           "type": "string",
-          "description": "Base url of AFFiNE server, used for generating external urls.\nDefault to be `[server.protocol]://[server.host][:server.port]` if not specified.\n    \n@default \"\"\n@environment `AFFINE_SERVER_EXTERNAL_URL`",
-          "default": ""
+          "description": "Base url of AFFiNE server, used for generating external urls.\nDefault to be `[server.protocol]://[server.host][:server.port]` if not specified.\n    \n@default \"http://localhost:3010\"\n@environment `AFFINE_SERVER_EXTERNAL_URL`",
+          "default": "http://localhost:3010"
         },
         "https": {
           "type": "boolean",
@@ -553,17 +593,6 @@
         }
       }
     },
-    "docService": {
-      "type": "object",
-      "description": "Configuration for docService module",
-      "properties": {
-        "endpoint": {
-          "type": "string",
-          "description": "The endpoint of the doc service.\n@default \"\"\n@environment `DOC_SERVICE_ENDPOINT`",
-          "default": ""
-        }
-      }
-    },
     "client": {
       "type": "object",
       "description": "Configuration for client module",
@@ -736,24 +765,6 @@
                     "accountId": {
                       "type": "string",
                       "description": "The account id for the cloudflare r2 storage provider."
-                    },
-                    "usePresignedURL": {
-                      "type": "object",
-                      "description": "The presigned url config for the cloudflare r2 storage provider.",
-                      "properties": {
-                        "enabled": {
-                          "type": "boolean",
-                          "description": "Whether to use presigned url for the cloudflare r2 storage provider."
-                        },
-                        "urlPrefix": {
-                          "type": "string",
-                          "description": "The presigned url prefix for the cloudflare r2 storage provider.\nsee https://developers.cloudflare.com/waf/custom-rules/use-cases/configure-token-authentication/ to configure it.\nExample value: \"https://storage.example.com\"\nExample rule: is_timed_hmac_valid_v0(\"your_secret\", http.request.uri, 10800, http.request.timestamp.sec, 6)"
-                        },
-                        "signKey": {
-                          "type": "string",
-                          "description": "The presigned key for the cloudflare r2 storage provider."
-                        }
-                      }
                     }
                   }
                 }
@@ -866,7 +877,7 @@
         },
         "stripe": {
           "type": "object",
-          "description": "Stripe sdk options\n@default {}\n@link https://docs.stripe.com/api",
+          "description": "Stripe API keys\n@default {}\n@link https://docs.stripe.com/api",
           "default": {}
         }
       }

.github/actions/deploy/deploy.mjs

@@ -10,7 +10,6 @@ const {
   DATABASE_USERNAME,
   DATABASE_PASSWORD,
   DATABASE_NAME,
-  GCLOUD_CONNECTION_NAME,
   CLOUD_SQL_IAM_ACCOUNT,
   APP_IAM_ACCOUNT,
   REDIS_SERVER_HOST,
@@ -72,7 +71,6 @@ const createHelmCommand = ({ isDryRun }) => {
     isProduction || isBeta || isInternal
       ? [
           `--set        cloud-sql-proxy.enabled=true`,
-          `--set-string cloud-sql-proxy.database.connectionName="${GCLOUD_CONNECTION_NAME}"`,
           `--set-string global.database.host=${DATABASE_URL}`,
           `--set-string global.database.user=${DATABASE_USERNAME}`,
           `--set-string global.database.password=${DATABASE_PASSWORD}`,

.github/helm/affine/charts/gcloud-sql-proxy/values.yaml

@@ -1,7 +1,5 @@
 replicaCount: 3
 enabled: false
-database: 
-  connectionName: ""
 
 image:
   # the tag is defined as chart appVersion.

.github/workflows/deploy.yml

@@ -92,16 +92,34 @@ jobs:
           APP_VERSION: ${{ steps.version.outputs.APP_VERSION }}
           DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
           CANARY_DEPLOY_HOST: ${{ secrets.CANARY_DEPLOY_HOST }}
+          R2_ACCOUNT_ID: ${{ secrets.R2_ACCOUNT_ID }}
+          R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
+          R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
+          CAPTCHA_TURNSTILE_SECRET: ${{ secrets.CAPTCHA_TURNSTILE_SECRET }}
+          COPILOT_OPENAI_API_KEY: ${{ secrets.COPILOT_OPENAI_API_KEY }}
+          COPILOT_FAL_API_KEY: ${{ secrets.COPILOT_FAL_API_KEY }}
+          COPILOT_GOOGLE_API_KEY: ${{ secrets.COPILOT_GOOGLE_API_KEY }}
+          COPILOT_PERPLEXITY_API_KEY: ${{ secrets.COPILOT_PERPLEXITY_API_KEY }}
+          COPILOT_UNSPLASH_API_KEY: ${{ secrets.COPILOT_UNSPLASH_API_KEY }}
+          METRICS_CUSTOMER_IO_TOKEN: ${{ secrets.METRICS_CUSTOMER_IO_TOKEN }}
+          MAILER_SENDER: ${{ secrets.OAUTH_EMAIL_SENDER }}
+          MAILER_USER: ${{ secrets.OAUTH_EMAIL_LOGIN }}
+          MAILER_PASSWORD: ${{ secrets.OAUTH_EMAIL_PASSWORD }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          AFFINE_GOOGLE_CLIENT_ID: ${{ secrets.AFFINE_GOOGLE_CLIENT_ID }}
+          AFFINE_GOOGLE_CLIENT_SECRET: ${{ secrets.AFFINE_GOOGLE_CLIENT_SECRET }}
           DATABASE_URL: ${{ secrets.DATABASE_URL }}
           DATABASE_USERNAME: ${{ secrets.DATABASE_USERNAME }}
           DATABASE_PASSWORD: ${{ secrets.DATABASE_PASSWORD }}
           DATABASE_NAME: ${{ secrets.DATABASE_NAME }}
           GCLOUD_CONNECTION_NAME: ${{ secrets.GCLOUD_CONNECTION_NAME }}
+          GCLOUD_CLOUD_SQL_INTERNAL_ENDPOINT: ${{ secrets.GCLOUD_CLOUD_SQL_INTERNAL_ENDPOINT }}
           REDIS_SERVER_HOST: ${{ secrets.REDIS_SERVER_HOST }}
           REDIS_SERVER_PASSWORD: ${{ secrets.REDIS_SERVER_PASSWORD }}
           CLOUD_SQL_IAM_ACCOUNT: ${{ secrets.CLOUD_SQL_IAM_ACCOUNT }}
           APP_IAM_ACCOUNT: ${{ secrets.APP_IAM_ACCOUNT }}
+          STRIPE_API_KEY: ${{ secrets.STRIPE_API_KEY }}
+          STRIPE_WEBHOOK_KEY: ${{ secrets.STRIPE_WEBHOOK_KEY }}
           STATIC_IP_NAME: ${{ secrets.STATIC_IP_NAME }}
 
   deploy-done:

.github/workflows/release-desktop.yml

@@ -142,19 +142,11 @@ jobs:
           # some flatpak deps need git protocol.file.allow
           git config --global protocol.file.allow always
 
-      - name: Remove nbstore node_modules
-        shell: bash
-        # node_modules of nbstore is not needed for building, and it will make the build process out of memory
-        run: |
-          rm -rf packages/frontend/apps/electron/node_modules/@affine/nbstore/node_modules/@blocksuite
-          rm -rf packages/frontend/apps/electron/node_modules/@affine/native/node_modules
-
       - name: make
         run: yarn affine @affine/electron make --platform=${{ matrix.spec.platform }} --arch=${{ matrix.spec.arch }}
         env:
           SKIP_WEB_BUILD: 1
           HOIST_NODE_MODULES: 1
-          NODE_OPTIONS: --max-old-space-size=14384
 
       - name: signing DMG
         if: ${{ matrix.spec.platform == 'darwin' }}
@@ -248,20 +240,11 @@ jobs:
       - name: Build Desktop Layers
         run: yarn affine @affine/electron build
 
-      - name: Remove nbstore node_modules
-        shell: bash
-        # node_modules of nbstore is not needed for building, and it will make the build process out of memory
-        run: |
-          rm -rf packages/frontend/apps/electron/node_modules/@affine/nbstore/node_modules/@blocksuite
-          rm -rf packages/frontend/apps/electron/node_modules/@affine/native/node_modules
-
       - name: package
-        run: |
-          yarn affine @affine/electron package --platform=${{ matrix.spec.platform }} --arch=${{ matrix.spec.arch }}
+        run: yarn affine @affine/electron package --platform=${{ matrix.spec.platform }} --arch=${{ matrix.spec.arch }}
         env:
           SKIP_WEB_BUILD: 1
           HOIST_NODE_MODULES: 1
-          NODE_OPTIONS: --max-old-space-size=14384
 
       - name: get all files to be signed
         id: get_files_to_be_signed
@@ -460,7 +443,6 @@ jobs:
         run: |
           cp ./.docker/selfhost/compose.yml ./release/docker-compose.yml
           cp ./.docker/selfhost/.env.example ./release/.env.example
-          cp ./.docker/selfhost/schema.json ./release/config.schema.json
       - name: Generate Release yml
         run: |
           node ./scripts/generate-release-yml.mjs

.github/workflows/release-mobile.yml

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

.yarnrc.yml

@@ -12,4 +12,4 @@ npmPublishAccess: public
 
 npmPublishRegistry: "https://registry.npmjs.org"
 
-yarnPath: .yarn/releases/yarn-4.8.1.cjs
+yarnPath: .yarn/releases/yarn-4.8.0.cjs

Cargo.lock

@@ -349,7 +349,7 @@ dependencies = [
  "derive_utils",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.99",
 ]
 
 [[package]]
@@ -406,9 +406,9 @@ dependencies = [
 
 [[package]]
 name = "base64ct"
-version = "1.7.3"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3"
+checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
 [[package]]
 name = "basic-toml"
@@ -434,7 +434,7 @@ dependencies = [
  "regex",
  "rustc-hash 1.1.0",
  "shlex",
- "syn 2.0.100",
+ "syn 2.0.99",
 ]
 
 [[package]]
@@ -508,18 +508,18 @@ dependencies = [
 
 [[package]]
 name = "borsh"
-version = "1.5.7"
+version = "1.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce"
+checksum = "5430e3be710b68d984d1391c854eb431a9d548640711faa54eecb1df93db91cc"
 dependencies = [
  "cfg_aliases",
 ]
 
 [[package]]
 name = "bpaf"
-version = "0.9.19"
+version = "0.9.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4848ed5727d39a7573551c205bcb1ccd88c8cad4ed2c80f62e2316f208196b8d"
+checksum = "4de4d74c5891642753c67ab88f58d971a68dd98673b69689a8c24ce3ec78a412"
 
 [[package]]
 name = "bstr"
@@ -729,9 +729,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.35"
+version = "4.5.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944"
+checksum = "027bb0d98429ae334a8698531da7077bdf906419543a35a55c2cb1b66437d767"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -739,9 +739,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.35"
+version = "4.5.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9"
+checksum = "5589e0cba072e0f3d23791efac0fd8627b49c829c196a492e88168e6a669d863"
 dependencies = [
  "anstream",
  "anstyle",
@@ -751,14 +751,14 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.32"
+version = "4.5.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7"
+checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.99",
 ]
 
 [[package]]
@@ -1068,7 +1068,7 @@ checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.99",
 ]
 
 [[package]]
@@ -1081,7 +1081,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 2.0.100",
+ "syn 2.0.99",
 ]
 
 [[package]]
@@ -1092,7 +1092,7 @@ checksum = "ccfae181bab5ab6c5478b2ccb69e4c68a02f8c3ec72f6616bfec9dbc599d2ee0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.99",
 ]
 
 [[package]]
@@ -1133,7 +1133,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.99",
 ]
 
 [[package]]
@@ -1259,9 +1259,9 @@ dependencies = [
 
 [[package]]
 name = "event-listener-strategy"
-version = "0.5.4"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
+checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2"
 dependencies = [
  "event-listener",
  "pin-project-lite",
@@ -1298,9 +1298,9 @@ checksum = "e7ef3d5e8ae27277c8285ac43ed153158178ef0f79567f32024ca8140a0c7cd8"
 
 [[package]]
 name = "flate2"
-version = "1.1.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
+checksum = "11faaf5a5236997af9848be0bef4db95824b1d534ebc64d0f0c6cf3e67bd38dc"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -1325,9 +1325,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "foldhash"
-version = "0.1.5"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f"
 
 [[package]]
 name = "foreign-types"
@@ -1347,7 +1347,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.99",
 ]
 
 [[package]]
@@ -1504,14 +1504,14 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.3.2"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0"
+checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
 dependencies = [
  "cfg-if",
  "libc",
- "r-efi",
- "wasi 0.14.2+wasi-0.2.4",
+ "wasi 0.13.3+wasi-0.2.2",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -1539,9 +1539,9 @@ dependencies = [
 
 [[package]]
 name = "half"
-version = "2.5.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7db2ff139bba50379da6aa0766b52fdcb62cb5b263009b09ed58ba604e14bbd1"
+checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
 dependencies = [
  "cfg-if",
  "crunchy",
@@ -1669,17 +1669,16 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.63"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "iana-time-zone-haiku",
  "js-sys",
- "log",
  "wasm-bindgen",
- "windows-core 0.61.0",
+ "windows-core 0.52.0",
 ]
 
 [[package]]
@@ -1732,9 +1731,9 @@ dependencies = [
 
 [[package]]
 name = "icu_locid_transform_data"
-version = "1.5.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
 
 [[package]]
 name = "icu_normalizer"
@@ -1756,9 +1755,9 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer_data"
-version = "1.5.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
 
 [[package]]
 name = "icu_properties"
@@ -1777,9 +1776,9 @@ dependencies = [
 
 [[package]]
 name = "icu_properties_data"
-version = "1.5.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
 
 [[package]]
 name = "icu_provider"
@@ -1806,7 +1805,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.99",
 ]
 
 [[package]]
@@ -1827,9 +1826,9 @@ dependencies = [
 
 [[package]]
 name = "icu_segmenter_data"
-version = "1.5.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1e52775179941363cc594e49ce99284d13d6948928d8e72c755f55e98caa1eb"
+checksum = "f739ee737260d955e330bc83fdeaaf1631f7fb7ed218761d3c04bb13bb7d79df"
 
 [[package]]
 name = "idna"
@@ -1854,9 +1853,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.8.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058"
+checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
 dependencies = [
  "equivalent",
  "hashbrown 0.15.2",
@@ -1996,7 +1995,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.6",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -2007,9 +2006,9 @@ checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa"
 
 [[package]]
 name = "libmimalloc-sys"
-version = "0.1.41"
+version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b20daca3a4ac14dbdc753c5e90fc7b490a48a9131daed3c9a9ced7b2defd37b"
+checksum = "07d0e07885d6a754b9c7993f2625187ad694ee985d60f23355ff0e7077261502"
 dependencies = [
  "cc",
  "libc",
@@ -2028,9 +2027,9 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.9.3"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413"
+checksum = "6db9c683daf087dc577b7506e9695b3d556a9f3849903fa28186283afd6809e9"
 
 [[package]]
 name = "litemap"
@@ -2050,9 +2049,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.27"
+version = "0.4.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
 
 [[package]]
 name = "loom"
@@ -2163,9 +2162,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "mimalloc"
-version = "0.1.45"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03cb1f88093fe50061ca1195d336ffec131347c7b833db31f9ab62a2d1b7925f"
+checksum = "99585191385958383e13f6b822e6b6d8d9cf928e7d286ceb092da92b43c87bc1"
 dependencies = [
  "libmimalloc-sys",
 ]
@@ -2194,9 +2193,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.7"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff70ce3e48ae43fa075863cef62e8b43b71a4f2382229920e0df362592919430"
+checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5"
 dependencies = [
  "adler2",
 ]
@@ -2224,9 +2223,9 @@ dependencies = [
 
 [[package]]
 name = "mp3lame-sys"
-version = "0.1.8"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21460ca4d833756cb700430888c67969e40b4560f50c226a0d258de551931ec"
+checksum = "acaec8842b2ebd61692a6c8c2b9f3edbf5c36e5e5c4677b5911430eaf859377c"
 dependencies = [
  "autotools",
  "cc",
@@ -2274,7 +2273,7 @@ dependencies = [
  "napi-derive-backend",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.99",
 ]
 
 [[package]]
@@ -2287,7 +2286,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "semver",
- "syn 2.0.100",
+ "syn 2.0.99",
 ]
 
 [[package]]
@@ -2431,7 +2430,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.99",
 ]
 
 [[package]]
@@ -2502,9 +2501,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.21.3"
+version = "1.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+checksum = "c2806eaa3524762875e21c3dcd057bc4b7bfa01ce4da8d46be1cd43649e1cc6b"
 
 [[package]]
 name = "oorandom"
@@ -2735,11 +2734,11 @@ checksum = "78451badbdaebaf17f053fd9152b3ffb33b516104eacb45e7864aaa9c712f306"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.21"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
 dependencies = [
- "zerocopy 0.8.24",
+ "zerocopy 0.7.35",
 ]
 
 [[package]]
@@ -2788,19 +2787,13 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.40"
+version = "1.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+checksum = "c1f1914ce909e1658d9907913b4b91947430c7d9be598b15a1912935b8c04801"
 dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "r-efi"
-version = "5.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
-
 [[package]]
 name = "radium"
 version = "0.7.0"
@@ -2826,7 +2819,7 @@ checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
 dependencies = [
  "rand_chacha 0.9.0",
  "rand_core 0.9.3",
- "zerocopy 0.8.24",
+ "zerocopy 0.8.23",
 ]
 
 [[package]]
@@ -2864,7 +2857,7 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
 dependencies = [
- "getrandom 0.3.2",
+ "getrandom 0.3.1",
 ]
 
 [[package]]
@@ -2980,9 +2973,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "ring"
-version = "0.17.14"
+version = "0.17.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
+checksum = "70ac5d832aa16abd7d1def883a8545280c20a60f523a370aa3a9617c2b8550ee"
 dependencies = [
  "cc",
  "cfg-if",
@@ -3017,7 +3010,7 @@ dependencies = [
  "rinja_parser",
  "rustc-hash 2.1.1",
  "serde",
- "syn 2.0.100",
+ "syn 2.0.99",
 ]
 
 [[package]]
@@ -3033,9 +3026,9 @@ dependencies = [
 
 [[package]]
 name = "rsa"
-version = "0.9.8"
+version = "0.9.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78928ac1ed176a5ca1d17e578a1825f3d81ca54cf41053a592584b020cfd691b"
+checksum = "47c75d7c5c6b673e58bf54d8544a9f432e3a925b0e80f7cd3602ab5c50c55519"
 dependencies = [
  "const-oid",
  "digest",
@@ -3053,9 +3046,9 @@ dependencies = [
 
 [[package]]
 name = "rubato"
-version = "0.16.2"
+version = "0.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5258099699851cfd0082aeb645feb9c084d9a5e1f1b8d5372086b989fc5e56a1"
+checksum = "cdd96992d7e24b3d7f35fdfe02af037a356ac90d41b466945cf3333525a86eea"
 dependencies = [
  "num-complex",
  "num-integer",
@@ -3107,9 +3100,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "1.0.5"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf"
+checksum = "dade4812df5c384711475be5fcd8c162555352945401aed22a35bffeab61f657"
 dependencies = [
  "bitflags 2.9.0",
  "errno",
@@ -3120,9 +3113,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.25"
+version = "0.23.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "822ee9188ac4ec04a2f0531e55d035fb2de73f18b41a63c70c2712503b6fb13c"
+checksum = "47796c98c480fce5406ef69d1c76378375492c3b0a0de587be0c1d9feb12f395"
 dependencies = [
  "once_cell",
  "ring",
@@ -3149,9 +3142,9 @@ checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.1"
+version = "0.102.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fef8b8769aaccf73098557a87cd1816b4f9c7c16811c9c77142aa695c16f2c03"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -3224,7 +3217,7 @@ checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.99",
 ]
 
 [[package]]
@@ -3253,7 +3246,7 @@ checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.99",
 ]
 
 [[package]]
@@ -3395,9 +3388,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.9"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef"
+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -3482,7 +3475,7 @@ dependencies = [
  "quote",
  "sqlx-core",
  "sqlx-macros-core",
- "syn 2.0.100",
+ "syn 2.0.99",
 ]
 
 [[package]]
@@ -3505,7 +3498,7 @@ dependencies = [
  "sqlx-mysql",
  "sqlx-postgres",
  "sqlx-sqlite",
- "syn 2.0.100",
+ "syn 2.0.99",
  "tempfile",
  "tokio",
  "url",
@@ -3642,9 +3635,9 @@ checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82"
 
 [[package]]
 name = "string_cache"
-version = "0.8.9"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf776ba3fa74f83bf4b63c3dcbbf82173db2632ed8452cb2d891d33f459de70f"
+checksum = "938d512196766101d333398efde81bc1f37b00cb42c2f8350e5df639f040bbbe"
 dependencies = [
  "new_debug_unreachable",
  "parking_lot",
@@ -3701,7 +3694,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.100",
+ "syn 2.0.99",
 ]
 
 [[package]]
@@ -3919,9 +3912,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.100"
+version = "2.0.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
+checksum = "e02e925281e18ffd9d640e234264753c43edc62d64b2d4cf898f1bc5e75f3fc2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3936,7 +3929,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.99",
 ]
 
 [[package]]
@@ -3947,12 +3940,13 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "tempfile"
-version = "3.19.1"
+version = "3.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf"
+checksum = "2c317e0a526ee6120d8dabad239c8dadca62b24b6f168914bbbc8e2fb1f0e567"
 dependencies = [
+ "cfg-if",
  "fastrand",
- "getrandom 0.3.2",
+ "getrandom 0.3.1",
  "once_cell",
  "rustix",
  "windows-sys 0.59.0",
@@ -4023,7 +4017,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.99",
 ]
 
 [[package]]
@@ -4034,7 +4028,7 @@ checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.99",
 ]
 
 [[package]]
@@ -4114,7 +4108,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.99",
 ]
 
 [[package]]
@@ -4174,7 +4168,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.99",
 ]
 
 [[package]]
@@ -4328,9 +4322,9 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-rust"
-version = "0.24.0"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b9b18034c684a2420722be8b2a91c9c44f2546b631c039edf575ccba8c61be1"
+checksum = "a4d64d449ca63e683c562c7743946a646671ca23947b9c925c0cfbe65051a4af"
 dependencies = [
  "cc",
  "tree-sitter-language",
@@ -4480,7 +4474,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f9902d4ed16c65e6c0222241024dd0bfeed07ea3deb7c470eb175e5f5ef406cd"
 dependencies = [
  "quote",
- "syn 2.0.100",
+ "syn 2.0.99",
 ]
 
 [[package]]
@@ -4495,7 +4489,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde",
- "syn 2.0.100",
+ "syn 2.0.99",
  "toml",
  "uniffi_meta",
 ]
@@ -4570,7 +4564,7 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9"
 dependencies = [
- "getrandom 0.3.2",
+ "getrandom 0.3.1",
 ]
 
 [[package]]
@@ -4621,9 +4615,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasi"
-version = "0.14.2+wasi-0.2.4"
+version = "0.13.3+wasi-0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
 dependencies = [
  "wit-bindgen-rt",
 ]
@@ -4656,7 +4650,7 @@ dependencies = [
  "log",
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.99",
  "wasm-bindgen-shared",
 ]
 
@@ -4678,7 +4672,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.99",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -4718,9 +4712,9 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
 
 [[package]]
 name = "whoami"
-version = "1.6.0"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6994d13118ab492c3c80c1f81928718159254c53c472bf9ce36f8dae4add02a7"
+checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d"
 dependencies = [
  "redox_syscall",
  "wasite",
@@ -4728,9 +4722,9 @@ dependencies = [
 
 [[package]]
 name = "widestring"
-version = "1.2.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7cf3379ca1aac9eea11fba24fd7e315d621f8dfe35c8d7d2be8b793726e07d"
+checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311"
 
 [[package]]
 name = "winapi"
@@ -4783,6 +4777,15 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-core"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-core"
 version = "0.57.0"
@@ -4804,23 +4807,10 @@ dependencies = [
  "windows-implement 0.58.0",
  "windows-interface 0.58.0",
  "windows-result 0.2.0",
- "windows-strings 0.1.0",
+ "windows-strings",
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-core"
-version = "0.61.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980"
-dependencies = [
- "windows-implement 0.60.0",
- "windows-interface 0.59.1",
- "windows-link",
- "windows-result 0.3.2",
- "windows-strings 0.4.0",
-]
-
 [[package]]
 name = "windows-implement"
 version = "0.57.0"
@@ -4829,7 +4819,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.99",
 ]
 
 [[package]]
@@ -4840,18 +4830,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
-]
-
-[[package]]
-name = "windows-implement"
-version = "0.60.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.100",
+ "syn 2.0.99",
 ]
 
 [[package]]
@@ -4862,7 +4841,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.99",
 ]
 
 [[package]]
@@ -4873,25 +4852,14 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
-]
-
-[[package]]
-name = "windows-interface"
-version = "0.59.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.100",
+ "syn 2.0.99",
 ]
 
 [[package]]
 name = "windows-link"
-version = "0.1.1"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
+checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3"
 
 [[package]]
 name = "windows-result"
@@ -4911,15 +4879,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-result"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252"
-dependencies = [
- "windows-link",
-]
-
 [[package]]
 name = "windows-strings"
 version = "0.1.0"
@@ -4930,15 +4889,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-strings"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97"
-dependencies = [
- "windows-link",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -5089,18 +5039,18 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.7.4"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e97b544156e9bebe1a0ffbc03484fc1ffe3100cbce3ffb17eac35f7cdd7ab36"
+checksum = "0e7f4ea97f6f78012141bcdb6a216b2609f0979ada50b20ca5b52dde2eac2bb1"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "wit-bindgen-rt"
-version = "0.39.0"
+version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
 dependencies = [
  "bitflags 2.9.0",
 ]
@@ -5188,7 +5138,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.99",
  "synstructure",
 ]
 
@@ -5198,16 +5148,17 @@ version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
+ "byteorder",
  "zerocopy-derive 0.7.35",
 ]
 
 [[package]]
 name = "zerocopy"
-version = "0.8.24"
+version = "0.8.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879"
+checksum = "fd97444d05a4328b90e75e503a34bad781f14e28a823ad3557f0750df1ebcbc6"
 dependencies = [
- "zerocopy-derive 0.8.24",
+ "zerocopy-derive 0.8.23",
 ]
 
 [[package]]
@@ -5218,18 +5169,18 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.99",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.24"
+version = "0.8.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be"
+checksum = "6352c01d0edd5db859a63e2605f4ea3183ddbd15e2c4a9e7d32184df75e4f154"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.99",
 ]
 
 [[package]]
@@ -5249,7 +5200,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.99",
  "synstructure",
 ]
 
@@ -5278,7 +5229,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.100",
+ "syn 2.0.99",
 ]
 
 [[package]]

Cargo.toml

@@ -66,7 +66,7 @@ tree-sitter-java       = { version = "0.23" }
 tree-sitter-javascript = { version = "0.23" }
 tree-sitter-kotlin-ng  = { version = "1.1" }
 tree-sitter-python     = { version = "0.23" }
-tree-sitter-rust       = { version = "0.24" }
+tree-sitter-rust       = { version = "0.23" }
 tree-sitter-scala      = { version = "0.23" }
 tree-sitter-typescript = { version = "0.23" }
 uniffi                 = "0.29"

README.md

@@ -21,23 +21,6 @@
 <br/>
 <br/>
 
-<div align="left" valign="middle">
-<a href="https://runblaze.dev">
- <picture>
-   <source media="(prefers-color-scheme: dark)" srcset="https://www.runblaze.dev/logo_dark.png">
-   <img align="right" src="https://www.runblaze.dev/logo_light.png" height="102px"/>
- </picture>
-</a>
-
-<br style="display: none;"/>
-
-_Special thanks to [Blaze](https://runblaze.dev) for their support of this project. They provide high-performance Apple Silicon macOS and Linux (AMD64 & ARM64) runners for GitHub Actions, greatly reducing our automated build times._
-
-</div>
-
-<br/>
-<br/>
-
 <div align="center">
     <a href="https://affine.pro">Home Page</a> |
     <a href="https://affine.pro/redirect/discord">Discord</a> |

blocksuite/affine/all/package.json

@@ -39,7 +39,6 @@
     "@blocksuite/affine-gfx-mindmap": "workspace:*",
     "@blocksuite/affine-gfx-note": "workspace:*",
     "@blocksuite/affine-gfx-shape": "workspace:*",
-    "@blocksuite/affine-gfx-template": "workspace:*",
     "@blocksuite/affine-gfx-text": "workspace:*",
     "@blocksuite/affine-gfx-turbo-renderer": "workspace:*",
     "@blocksuite/affine-inline-footnote": "workspace:*",
@@ -129,7 +128,6 @@
     "./gfx/mindmap": "./src/gfx/mindmap.ts",
     "./gfx/connector": "./src/gfx/connector.ts",
     "./gfx/group": "./src/gfx/group.ts",
-    "./gfx/template": "./src/gfx/template.ts",
     "./gfx/turbo-renderer": "./src/gfx/turbo-renderer.ts",
     "./components/block-selection": "./src/components/block-selection.ts",
     "./components/block-zero-width": "./src/components/block-zero-width.ts",
@@ -183,6 +181,6 @@
   "version": "0.20.0",
   "devDependencies": {
     "@vanilla-extract/vite-plugin": "^5.0.0",
-    "vitest": "3.1.1"
+    "vitest": "3.0.9"
   }
 }

blocksuite/affine/all/src/__tests__/utils/get-provider.ts

@@ -1,13 +1,9 @@
 import { SpecProvider } from '@blocksuite/affine-shared/utils';
 import { Container } from '@blocksuite/global/di';
 
-import {
-  registerBlockSpecs,
-  registerStoreSpecs,
-} from '../../extensions/register';
+import { registerSpecs } from '../../extensions/register';
 
-registerStoreSpecs();
-registerBlockSpecs();
+registerSpecs();
 
 export function getProvider() {
   const container = new Container();

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

@@ -1 +0,0 @@
-export * from '@blocksuite/affine-components/open-doc-dropdown-menu';

blocksuite/affine/all/src/effects.ts

@@ -34,7 +34,6 @@ import { effects as componentHighlightDropdownMenuEffects } from '@blocksuite/af
 import { IconButton } from '@blocksuite/affine-components/icon-button';
 import { effects as componentLinkPreviewEffects } from '@blocksuite/affine-components/link-preview';
 import { effects as componentLinkedDocTitleEffects } from '@blocksuite/affine-components/linked-doc-title';
-import { effects as componentOpenDocDropdownMenuEffects } from '@blocksuite/affine-components/open-doc-dropdown-menu';
 import { effects as componentPortalEffects } from '@blocksuite/affine-components/portal';
 import { effects as componentSizeDropdownMenuEffects } from '@blocksuite/affine-components/size-dropdown-menu';
 import { SmoothCorner } from '@blocksuite/affine-components/smooth-corner';
@@ -63,7 +62,7 @@ import { effects as widgetToolbarEffects } from '@blocksuite/affine-widget-toolb
 import { effects as dataViewEffects } from '@blocksuite/data-view/effects';
 import { effects as stdEffects } from '@blocksuite/std/effects';
 
-import { registerBlockSpecs } from './extensions';
+import { registerSpecs } from './extensions/register.js';
 
 export declare const _GLOBAL_:
   | typeof stdEffects
@@ -113,7 +112,8 @@ export declare const _GLOBAL_:
   | typeof fragmentOutlineEffects;
 
 export function effects() {
-  registerBlockSpecs();
+  registerSpecs();
+
   stdEffects();
 
   dataViewEffects();
@@ -165,7 +165,6 @@ export function effects() {
   componentEdgelessLineWidthEffects();
   componentEdgelessLineStylesEffects();
   componentEdgelessShapeColorPickerEffects();
-  componentOpenDocDropdownMenuEffects();
 
   widgetScrollAnchoringEffects();
   widgetFrameTitleEffects();

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

@@ -17,40 +17,14 @@ import {
 } from '@blocksuite/affine-block-note';
 import { ParagraphBlockSpec } from '@blocksuite/affine-block-paragraph';
 import {
-  EdgelessSurfaceBlockAdapterExtensions,
   EdgelessSurfaceBlockSpec,
   PageSurfaceBlockSpec,
-  SurfaceBlockAdapterExtensions,
 } from '@blocksuite/affine-block-surface';
 import {
   EdgelessSurfaceRefBlockSpec,
   PageSurfaceRefBlockSpec,
 } from '@blocksuite/affine-block-surface-ref';
 import { TableBlockSpec } from '@blocksuite/affine-block-table';
-import {
-  brushToMarkdownAdapterMatcher,
-  brushToPlainTextAdapterMatcher,
-} from '@blocksuite/affine-gfx-brush';
-import {
-  connectorToMarkdownAdapterMatcher,
-  connectorToPlainTextAdapterMatcher,
-} from '@blocksuite/affine-gfx-connector';
-import {
-  groupToMarkdownAdapterMatcher,
-  groupToPlainTextAdapterMatcher,
-} from '@blocksuite/affine-gfx-group';
-import {
-  mindmapToMarkdownAdapterMatcher,
-  mindmapToPlainTextAdapterMatcher,
-} from '@blocksuite/affine-gfx-mindmap';
-import {
-  shapeToMarkdownAdapterMatcher,
-  shapeToPlainTextAdapterMatcher,
-} from '@blocksuite/affine-gfx-shape';
-import {
-  textToMarkdownAdapterMatcher,
-  textToPlainTextAdapterMatcher,
-} from '@blocksuite/affine-gfx-text';
 import { inlinePresetExtensions } from '@blocksuite/affine-inline-preset';
 import {
   DefaultOpenDocExtension,
@@ -60,24 +34,6 @@ import {
 } from '@blocksuite/affine-shared/services';
 import type { ExtensionType } from '@blocksuite/store';
 
-const elementToPlainTextAdapterMatchers = [
-  groupToPlainTextAdapterMatcher,
-  shapeToPlainTextAdapterMatcher,
-  connectorToPlainTextAdapterMatcher,
-  brushToPlainTextAdapterMatcher,
-  textToPlainTextAdapterMatcher,
-  mindmapToPlainTextAdapterMatcher,
-];
-
-const elementToMarkdownAdapterMatchers = [
-  groupToMarkdownAdapterMatcher,
-  shapeToMarkdownAdapterMatcher,
-  connectorToMarkdownAdapterMatcher,
-  brushToMarkdownAdapterMatcher,
-  textToMarkdownAdapterMatcher,
-  mindmapToMarkdownAdapterMatcher,
-];
-
 export const CommonBlockSpecs: ExtensionType[] = [
   inlinePresetExtensions,
   DocDisplayMetaService,
@@ -98,9 +54,6 @@ export const CommonBlockSpecs: ExtensionType[] = [
   FontLoaderService,
   CalloutBlockSpec,
   FrameBlockSpec,
-
-  elementToPlainTextAdapterMatchers,
-  elementToMarkdownAdapterMatchers,
 ].flat();
 
 export const PageFirstPartyBlockSpecs: ExtensionType[] = [
@@ -108,8 +61,6 @@ export const PageFirstPartyBlockSpecs: ExtensionType[] = [
   NoteBlockSpec,
   PageSurfaceBlockSpec,
   PageSurfaceRefBlockSpec,
-
-  ...SurfaceBlockAdapterExtensions,
 ].flat();
 
 export const EdgelessFirstPartyBlockSpecs: ExtensionType[] = [
@@ -119,6 +70,4 @@ export const EdgelessFirstPartyBlockSpecs: ExtensionType[] = [
   EdgelessSurfaceBlockSpec,
   EdgelessSurfaceRefBlockSpec,
   EdgelessTextBlockSpec,
-
-  ...EdgelessSurfaceBlockAdapterExtensions,
 ].flat();

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

@@ -1,5 +1,4 @@
-export * from './common';
-export * from './editor-specs';
-export * from './preview-specs';
-export * from './register';
-export * from './store';
+export * from './common.js';
+export * from './editor-specs.js';
+export * from './preview-specs.js';
+export * from './store.js';

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

@@ -10,11 +10,8 @@ import {
 } from './preview-specs.js';
 import { StoreExtensions } from './store.js';
 
-export function registerStoreSpecs() {
+export function registerSpecs() {
   SpecProvider._.addSpec('store', StoreExtensions);
-}
-
-export function registerBlockSpecs() {
   SpecProvider._.addSpec('page', PageEditorBlockSpecs);
   SpecProvider._.addSpec('edgeless', EdgelessEditorBlockSpecs);
   SpecProvider._.addSpec('preview:page', PreviewPageEditorBlockSpecs);

blocksuite/affine/all/src/gfx/template.ts

@@ -1 +0,0 @@
-export * from '@blocksuite/affine-gfx-template';

blocksuite/affine/all/tsconfig.json

@@ -36,7 +36,6 @@
     { "path": "../gfx/mindmap" },
     { "path": "../gfx/note" },
     { "path": "../gfx/shape" },
-    { "path": "../gfx/template" },
     { "path": "../gfx/text" },
     { "path": "../gfx/turbo-renderer" },
     { "path": "../inlines/footnote" },

blocksuite/affine/blocks/block-attachment/package.json

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

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

@@ -1,9 +1,9 @@
-import { fontXSStyle, panelBaseStyle } from '@blocksuite/affine-shared/styles';
+import { FONT_XS, PANEL_BASE } from '@blocksuite/affine-shared/styles';
 import { css } from 'lit';
 
 export const renameStyles = css`
-  ${panelBaseStyle('.affine-attachment-rename-container')}
   .affine-attachment-rename-container {
+    ${PANEL_BASE};
     position: relative;
     display: flex;
     align-items: center;
@@ -35,8 +35,8 @@ export const renameStyles = css`
     outline: none;
     background: transparent;
     color: var(--affine-text-primary-color);
+    ${FONT_XS};
   }
-  ${fontXSStyle('.affine-attachment-rename-input-wrapper input')}
 
   .affine-attachment-rename-input-wrapper input::placeholder {
     color: var(--affine-placeholder-color);

blocksuite/affine/blocks/block-attachment/src/edgeless-clipboard-config.ts

@@ -1,34 +0,0 @@
-import { EdgelessClipboardConfig } from '@blocksuite/affine-block-surface';
-import { type BlockSnapshot } from '@blocksuite/store';
-
-export class EdgelessClipboardAttachmentConfig extends EdgelessClipboardConfig {
-  static override readonly key = 'affine:attachment';
-
-  override async createBlock(
-    attachment: BlockSnapshot
-  ): Promise<string | null> {
-    if (!this.surface) return null;
-
-    const { xywh, rotate, sourceId, name, size, type, embed, style } =
-      attachment.props;
-
-    if (!(await this.std.workspace.blobSync.get(sourceId as string))) {
-      return null;
-    }
-    const attachmentId = this.crud.addBlock(
-      'affine:attachment',
-      {
-        xywh,
-        rotate,
-        sourceId,
-        name,
-        size,
-        type,
-        embed,
-        style,
-      },
-      this.surface.model.id
-    );
-    return attachmentId;
-  }
-}

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

@@ -3,7 +3,6 @@ export * from './attachment-block';
 export * from './attachment-service';
 export * from './attachment-spec';
 export { attachmentViewDropdownMenu } from './configs/toolbar';
-export * from './edgeless-clipboard-config';
 export {
   type AttachmentEmbedConfig,
   AttachmentEmbedConfigIdentifier,

blocksuite/affine/blocks/block-bookmark/package.json

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

blocksuite/affine/blocks/block-bookmark/src/commands/insert-link-by-quick-search.ts

@@ -4,7 +4,10 @@ import {
   insertEmbedLinkedDocCommand,
   type LinkableFlavour,
 } from '@blocksuite/affine-block-embed';
-import { QuickSearchProvider } from '@blocksuite/affine-shared/services';
+import {
+  FeatureFlagService,
+  QuickSearchProvider,
+} from '@blocksuite/affine-shared/services';
 import type { Command } from '@blocksuite/std';
 
 import { insertBookmarkCommand } from './insert-bookmark';
@@ -38,20 +41,35 @@ export const insertLinkByQuickSearchCommand: Command<
 
       // add normal link;
       if ('externalUrl' in result) {
-        // try to insert embed iframe block first
-        const [success, { flavour }] = std.command
-          .chain()
-          .try(chain => [
-            chain.pipe(insertEmbedIframeWithUrlCommand, {
-              url: result.externalUrl,
-            }),
-            chain.pipe(insertBookmarkCommand, { url: result.externalUrl }),
-          ])
-          .run();
-        if (!success || !flavour) return null;
-        return {
-          flavour: flavour as LinkableFlavour,
-        };
+        const featureFlagService = std.get(FeatureFlagService);
+        const enableEmbedIframeBlock = featureFlagService.getFlag(
+          'enable_embed_iframe_block'
+        );
+        if (enableEmbedIframeBlock) {
+          // try to insert embed iframe block first
+          const [success, { flavour }] = std.command
+            .chain()
+            .try(chain => [
+              chain.pipe(insertEmbedIframeWithUrlCommand, {
+                url: result.externalUrl,
+              }),
+              chain.pipe(insertBookmarkCommand, { url: result.externalUrl }),
+            ])
+            .run();
+          if (!success || !flavour) return null;
+          return {
+            flavour: flavour as LinkableFlavour,
+          };
+        } else {
+          const [success, { flavour }] = std.command.exec(
+            insertBookmarkCommand,
+            { url: result.externalUrl }
+          );
+          if (!success || !flavour) return null;
+          return {
+            flavour: flavour as LinkableFlavour,
+          };
+        }
       }
 
       return null;

blocksuite/affine/blocks/block-bookmark/src/edgeless-clipboard-config.ts

@@ -1,29 +0,0 @@
-import { EdgelessClipboardConfig } from '@blocksuite/affine-block-surface';
-import { type BlockSnapshot } from '@blocksuite/store';
-
-export class EdgelessClipboardBookmarkConfig extends EdgelessClipboardConfig {
-  static override readonly key = 'affine:bookmark';
-
-  override createBlock(bookmark: BlockSnapshot): string | null {
-    if (!this.surface) return null;
-
-    const { xywh, style, url, caption, description, icon, image, title } =
-      bookmark.props;
-
-    const bookmarkId = this.crud.addBlock(
-      'affine:bookmark',
-      {
-        xywh,
-        style,
-        url,
-        caption,
-        description,
-        icon,
-        image,
-        title,
-      },
-      this.surface.model.id
-    );
-    return bookmarkId;
-  }
-}

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

@@ -4,4 +4,3 @@ export * from './bookmark-spec';
 export * from './commands';
 export * from './components';
 export { BookmarkSlashMenuConfigIdentifier } from './configs/slash-menu';
-export * from './edgeless-clipboard-config';

blocksuite/affine/blocks/block-callout/package.json

@@ -17,7 +17,7 @@
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/affine-widget-slash-menu": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.10",
+    "@blocksuite/icons": "^2.2.8",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@emoji-mart/data": "^1.2.1",

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

@@ -2,7 +2,7 @@ import { CaptionedBlockComponent } from '@blocksuite/affine-components/caption';
 import { createLitPortal } from '@blocksuite/affine-components/portal';
 import { DefaultInlineManagerExtension } from '@blocksuite/affine-inline-preset';
 import { type CalloutBlockModel } from '@blocksuite/affine-model';
-import { EDGELESS_TOP_CONTENTEDITABLE_SELECTOR } from '@blocksuite/affine-shared/consts';
+import { NOTE_SELECTOR } from '@blocksuite/affine-shared/consts';
 import {
   DocModeProvider,
   ThemeProvider,
@@ -95,9 +95,7 @@ export class CalloutBlockComponent extends CaptionedBlockComponent<CalloutBlockM
 
   override get topContenteditableElement() {
     if (this.std.get(DocModeProvider).getEditorMode() === 'edgeless') {
-      return this.closest<BlockComponent>(
-        EDGELESS_TOP_CONTENTEDITABLE_SELECTOR
-      );
+      return this.closest<BlockComponent>(NOTE_SELECTOR);
     }
     return this.rootComponent;
   }

blocksuite/affine/blocks/block-code/package.json

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

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

@@ -1,10 +1,7 @@
 import { CaptionedBlockComponent } from '@blocksuite/affine-components/caption';
 import type { CodeBlockModel } from '@blocksuite/affine-model';
 import { focusTextModel, type RichText } from '@blocksuite/affine-rich-text';
-import {
-  BRACKET_PAIRS,
-  EDGELESS_TOP_CONTENTEDITABLE_SELECTOR,
-} from '@blocksuite/affine-shared/consts';
+import { BRACKET_PAIRS, NOTE_SELECTOR } from '@blocksuite/affine-shared/consts';
 import {
   DocModeProvider,
   NotificationProvider,
@@ -82,9 +79,7 @@ export class CodeBlockComponent extends CaptionedBlockComponent<CodeBlockModel>
 
   override get topContenteditableElement() {
     if (this.std.get(DocModeProvider).getEditorMode() === 'edgeless') {
-      return this.closest<BlockComponent>(
-        EDGELESS_TOP_CONTENTEDITABLE_SELECTOR
-      );
+      return this.closest<BlockComponent>(NOTE_SELECTOR);
     }
     return this.rootComponent;
   }

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

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

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

@@ -12,7 +12,7 @@ import {
 import { CopyIcon, DeleteIcon } from '@blocksuite/affine-components/icons';
 import { PeekViewProvider } from '@blocksuite/affine-components/peek';
 import { toast } from '@blocksuite/affine-components/toast';
-import { EDGELESS_TOP_CONTENTEDITABLE_SELECTOR } from '@blocksuite/affine-shared/consts';
+import { NOTE_SELECTOR } from '@blocksuite/affine-shared/consts';
 import {
   DocModeProvider,
   NotificationProvider,
@@ -225,9 +225,7 @@ export class DataViewBlockComponent extends CaptionedBlockComponent<DataViewBloc
 
   override get topContenteditableElement() {
     if (this.std.get(DocModeProvider).getEditorMode() === 'edgeless') {
-      return this.closest<BlockComponent>(
-        EDGELESS_TOP_CONTENTEDITABLE_SELECTOR
-      );
+      return this.closest<BlockComponent>(NOTE_SELECTOR);
     }
     return this.rootComponent;
   }

blocksuite/affine/blocks/block-database/package.json

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

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

@@ -8,7 +8,7 @@ import { DropIndicator } from '@blocksuite/affine-components/drop-indicator';
 import { PeekViewProvider } from '@blocksuite/affine-components/peek';
 import { toast } from '@blocksuite/affine-components/toast';
 import type { DatabaseBlockModel } from '@blocksuite/affine-model';
-import { EDGELESS_TOP_CONTENTEDITABLE_SELECTOR } from '@blocksuite/affine-shared/consts';
+import { NOTE_SELECTOR } from '@blocksuite/affine-shared/consts';
 import {
   DocModeProvider,
   NotificationProvider,
@@ -354,9 +354,7 @@ export class DatabaseBlockComponent extends CaptionedBlockComponent<DatabaseBloc
 
   override get topContenteditableElement() {
     if (this.std.get(DocModeProvider).getEditorMode() === 'edgeless') {
-      return this.closest<BlockComponent>(
-        EDGELESS_TOP_CONTENTEDITABLE_SELECTOR
-      );
+      return this.closest<BlockComponent>(NOTE_SELECTOR);
     }
     return this.rootComponent;
   }

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

@@ -12,14 +12,13 @@
   "dependencies": {
     "@blocksuite/affine-block-surface": "workspace:*",
     "@blocksuite/affine-components": "workspace:*",
-    "@blocksuite/affine-gfx-text": "workspace:*",
     "@blocksuite/affine-inline-preset": "workspace:*",
     "@blocksuite/affine-model": "workspace:*",
     "@blocksuite/affine-rich-text": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/affine-widget-edgeless-toolbar": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.10",
+    "@blocksuite/icons": "^2.2.8",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@floating-ui/dom": "^1.6.13",

blocksuite/affine/blocks/block-edgeless-text/src/commands/insert-edgeless-text.ts

@@ -2,17 +2,17 @@ import {
   EdgelessCRUDIdentifier,
   getSurfaceBlock,
 } from '@blocksuite/affine-block-surface';
-import {
-  EDGELESS_TEXT_BLOCK_MIN_HEIGHT,
-  EDGELESS_TEXT_BLOCK_MIN_WIDTH,
-  EdgelessTextBlockModel,
-} from '@blocksuite/affine-model';
 import { focusTextModel } from '@blocksuite/affine-rich-text';
-import { matchModels } from '@blocksuite/affine-shared/utils';
 import { Bound } from '@blocksuite/global/gfx';
 import type { Command } from '@blocksuite/std';
 import { GfxControllerIdentifier } from '@blocksuite/std/gfx';
 
+import {
+  EDGELESS_TEXT_BLOCK_MIN_HEIGHT,
+  EDGELESS_TEXT_BLOCK_MIN_WIDTH,
+  EdgelessTextBlockComponent,
+} from '../edgeless-text-block.js';
+
 export const insertEdgelessTextCommand: Command<
   {
     x: number;
@@ -59,9 +59,8 @@ export const insertEdgelessTextCommand: Command<
         const id = selection.selectedIds[0];
         if (!editing || id !== textId) {
           const textBlock = host.view.getBlock(textId);
-          const model = textBlock?.model;
-          if (matchModels(model, [EdgelessTextBlockModel])) {
-            model.props.hasMaxWidth = true;
+          if (textBlock instanceof EdgelessTextBlockComponent) {
+            textBlock.model.props.hasMaxWidth = true;
           }
 
           disposable.unsubscribe();

blocksuite/affine/blocks/block-edgeless-text/src/edgeless-clipboard-config.ts

@@ -1,33 +0,0 @@
-import { EdgelessClipboardConfig } from '@blocksuite/affine-block-surface';
-import { type BlockSnapshot } from '@blocksuite/store';
-
-export class EdgelessClipboardEdgelessTextConfig extends EdgelessClipboardConfig {
-  static override readonly key = 'affine:edgeless-text';
-
-  override async createBlock(
-    edgelessText: BlockSnapshot
-  ): Promise<string | null> {
-    const oldId = edgelessText.id;
-    delete edgelessText.props.index;
-    if (!edgelessText.props.xywh) {
-      console.error(
-        `EdgelessText block(id: ${oldId}) does not have xywh property`
-      );
-      return null;
-    }
-    if (!this.surface) {
-      return null;
-    }
-    const newId = await this.onBlockSnapshotPaste(
-      edgelessText,
-      this.std.store,
-      this.surface.model.id
-    );
-    if (!newId) {
-      console.error(`Failed to paste EdgelessText block(id: ${oldId})`);
-      return null;
-    }
-
-    return newId;
-  }
-}

blocksuite/affine/blocks/block-edgeless-text/src/edgeless-text-block.ts

@@ -1,8 +1,6 @@
 import { TextUtils } from '@blocksuite/affine-block-surface';
 import { formatBlockCommand } from '@blocksuite/affine-inline-preset';
 import {
-  EDGELESS_TEXT_BLOCK_MIN_HEIGHT,
-  EDGELESS_TEXT_BLOCK_MIN_WIDTH,
   type EdgelessTextBlockModel,
   ListBlockModel,
   ParagraphBlockModel,
@@ -25,6 +23,9 @@ import { css, html } from 'lit';
 import { query, state } from 'lit/decorators.js';
 import { type StyleInfo, styleMap } from 'lit/directives/style-map.js';
 
+export const EDGELESS_TEXT_BLOCK_MIN_WIDTH = 50;
+export const EDGELESS_TEXT_BLOCK_MIN_HEIGHT = 50;
+
 export class EdgelessTextBlockComponent extends GfxBlockComponent<EdgelessTextBlockModel> {
   static override styles = css`
     .edgeless-text-block-container[data-max-width='false'] .inline-editor span {
@@ -338,8 +339,6 @@ export class EdgelessTextBlockComponent extends GfxBlockComponent<EdgelessTextBl
       minWidth: !hasMaxWidth ? '220px' : undefined,
     };
 
-    this.contentEditable = String(editing && !this.doc.readonly$.value);
-
     return html`
       <div
         class="edgeless-text-block-container"
@@ -351,6 +350,7 @@ export class EdgelessTextBlockComponent extends GfxBlockComponent<EdgelessTextBl
             pointerEvents: editing ? 'auto' : 'none',
             userSelect: editing ? 'auto' : 'none',
           })}
+          contenteditable=${editing}
         >
           ${this.renderPageContent()}
         </div>

blocksuite/affine/blocks/block-edgeless-text/src/edgelss-toolbar/config.ts

@@ -1,9 +1,9 @@
-import { createTextActions } from '@blocksuite/affine-gfx-text';
 import { EdgelessTextBlockModel } from '@blocksuite/affine-model';
 import {
   type ToolbarModuleConfig,
   ToolbarModuleExtension,
 } from '@blocksuite/affine-shared/services';
+import { createTextActions } from '@blocksuite/affine-widget-edgeless-toolbar';
 import { BlockFlavourIdentifier } from '@blocksuite/std';
 
 export const edgelessTextToolbarConfig = {

blocksuite/affine/blocks/block-edgeless-text/src/index.ts

@@ -1,4 +1,4 @@
-export * from './edgeless-clipboard-config';
+export * from './commands';
 export * from './edgeless-text-block.js';
 export * from './edgeless-text-spec.js';
-export * from './edgeless-toolbar';
+export * from './edgelss-toolbar';

blocksuite/affine/blocks/block-edgeless-text/tsconfig.json

@@ -9,7 +9,6 @@
   "references": [
     { "path": "../block-surface" },
     { "path": "../../components" },
-    { "path": "../../gfx/text" },
     { "path": "../../inlines/preset" },
     { "path": "../../model" },
     { "path": "../../rich-text" },

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

@@ -18,7 +18,7 @@
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/affine-widget-slash-menu": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.10",
+    "@blocksuite/icons": "^2.2.8",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@floating-ui/dom": "^1.6.13",
@@ -34,7 +34,7 @@
     "zod": "^3.23.8"
   },
   "devDependencies": {
-    "vitest": "3.1.1"
+    "vitest": "3.0.9"
   },
   "exports": {
     ".": "./src/index.ts",

blocksuite/affine/blocks/block-embed/src/embed-figma-block/edgeless-clipboard-config.ts

@@ -1,25 +0,0 @@
-import { EdgelessClipboardConfig } from '@blocksuite/affine-block-surface';
-import { type BlockSnapshot } from '@blocksuite/store';
-
-export class EdgelessClipboardEmbedFigmaConfig extends EdgelessClipboardConfig {
-  static override readonly key = 'affine:embed-figma';
-
-  override createBlock(figmaEmbed: BlockSnapshot): string | null {
-    if (!this.surface) return null;
-    const { xywh, style, url, caption, title, description } = figmaEmbed.props;
-
-    const embedFigmaId = this.crud.addBlock(
-      'affine:embed-figma',
-      {
-        xywh,
-        style,
-        url,
-        caption,
-        title,
-        description,
-      },
-      this.surface.model.id
-    );
-    return embedFigmaId;
-  }
-}

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

@@ -1,5 +1,4 @@
 export * from './adapters/index.js';
-export * from './edgeless-clipboard-config';
 export * from './embed-figma-block.js';
 export * from './embed-figma-model.js';
 export * from './embed-figma-spec.js';

blocksuite/affine/blocks/block-embed/src/embed-github-block/edgeless-clipboard-config.ts

@@ -1,51 +0,0 @@
-import { EdgelessClipboardConfig } from '@blocksuite/affine-block-surface';
-import { type BlockSnapshot } from '@blocksuite/store';
-
-export class EdgelessClipboardEmbedGithubConfig extends EdgelessClipboardConfig {
-  static override readonly key = 'affine:embed-github';
-
-  override createBlock(githubEmbed: BlockSnapshot): string | null {
-    if (!this.surface) return null;
-
-    const {
-      xywh,
-      style,
-      owner,
-      repo,
-      githubType,
-      githubId,
-      url,
-      caption,
-      image,
-      status,
-      statusReason,
-      title,
-      description,
-      createdAt,
-      assignees,
-    } = githubEmbed.props;
-
-    const embedGithubId = this.crud.addBlock(
-      'affine:embed-github',
-      {
-        xywh,
-        style,
-        owner,
-        repo,
-        githubType,
-        githubId,
-        url,
-        caption,
-        image,
-        status,
-        statusReason,
-        title,
-        description,
-        createdAt,
-        assignees,
-      },
-      this.surface.model.id
-    );
-    return embedGithubId;
-  }
-}

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

@@ -1,5 +1,4 @@
 export * from './adapters/index.js';
-export * from './edgeless-clipboard-config';
 export * from './embed-github-block.js';
 export * from './embed-github-service.js';
 export * from './embed-github-spec.js';

blocksuite/affine/blocks/block-embed/src/embed-html-block/edgeless-clipboard-config.ts

@@ -1,24 +0,0 @@
-import { EdgelessClipboardConfig } from '@blocksuite/affine-block-surface';
-import { type BlockSnapshot } from '@blocksuite/store';
-
-export class EdgelessClipboardEmbedHtmlConfig extends EdgelessClipboardConfig {
-  static override readonly key = 'affine:embed-html';
-
-  override createBlock(htmlEmbed: BlockSnapshot): string | null {
-    if (!this.surface) return null;
-    const { xywh, style, caption, html, design } = htmlEmbed.props;
-
-    const embedHtmlId = this.crud.addBlock(
-      'affine:embed-html',
-      {
-        xywh,
-        style,
-        caption,
-        html,
-        design,
-      },
-      this.surface.model.id
-    );
-    return embedHtmlId;
-  }
-}

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

@@ -1,4 +1,3 @@
-export * from './edgeless-clipboard-config';
 export * from './embed-html-block.js';
 export * from './embed-html-spec.js';
 export {

blocksuite/affine/blocks/block-embed/src/embed-iframe-block/commands/insert-embed-iframe-with-url.ts

@@ -90,15 +90,15 @@ export const insertEmbedIframeWithUrlCommand: Command<
       surfaceBlock.model
     );
 
-    gfx.tool.setTool(
-      // @ts-expect-error FIXME: resolve after gfx tool refactor
-      'default'
-    );
-
     gfx.selection.set({
       elements: [newBlockId],
       editing: false,
     });
+
+    gfx.tool.setTool(
+      // @ts-expect-error FIXME: resolve after gfx tool refactor
+      'default'
+    );
   }
 
   if (!newBlockId) {

blocksuite/affine/blocks/block-embed/src/embed-iframe-block/components/embed-iframe-error-card.ts

@@ -1,9 +1,5 @@
 import { createLitPortal } from '@blocksuite/affine-components/portal';
 import type { EmbedIframeBlockModel } from '@blocksuite/affine-model';
-import {
-  DocModeProvider,
-  TelemetryProvider,
-} from '@blocksuite/affine-shared/services';
 import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
 import { WithDisposable } from '@blocksuite/global/lit';
 import { EditIcon, InformationIcon, ResetIcon } from '@blocksuite/icons/lit';
@@ -195,9 +191,11 @@ export class EmbedIframeErrorCard extends WithDisposable(LitElement) {
         .model=${this.model}
         .abortController=${this._editAbortController}
         .std=${this.std}
-        .inSurface=${this.inSurface}
       ></embed-iframe-link-edit-popup>`,
-      container: document.body,
+      portalStyles: {
+        zIndex: 'var(--affine-z-index-popover)',
+      },
+      container: this.host,
       computePosition: {
         referenceElement: this._editButton,
         placement: 'bottom-start',
@@ -212,15 +210,6 @@ export class EmbedIframeErrorCard extends WithDisposable(LitElement) {
   private readonly _handleRetry = (e: MouseEvent) => {
     e.stopPropagation();
     this.onRetry();
-
-    // track retry event
-    this.telemetryService?.track('ReloadLink', {
-      type: 'embed iframe block',
-      page: this.editorMode === 'page' ? 'doc editor' : 'whiteboard editor',
-      segment: 'editor',
-      module: 'embed block',
-      control: 'reload button',
-    });
   };
 
   override render() {
@@ -284,16 +273,6 @@ export class EmbedIframeErrorCard extends WithDisposable(LitElement) {
     return this.model.doc.readonly;
   }
 
-  get telemetryService() {
-    return this.std.getOptional(TelemetryProvider);
-  }
-
-  get editorMode() {
-    const docModeService = this.std.get(DocModeProvider);
-    const mode = docModeService.getEditorMode();
-    return mode ?? 'page';
-  }
-
   @query('.button.edit')
   accessor _editButton: HTMLElement | null = null;
 
@@ -309,9 +288,6 @@ export class EmbedIframeErrorCard extends WithDisposable(LitElement) {
   @property({ attribute: false })
   accessor std!: BlockStdScope;
 
-  @property({ attribute: false })
-  accessor inSurface = false;
-
   @property({ attribute: false })
   accessor options: EmbedIframeStatusCardOptions = {
     layout: 'horizontal',

blocksuite/affine/blocks/block-embed/src/embed-iframe-block/components/embed-iframe-link-edit-popup.ts

@@ -1,7 +1,3 @@
-import {
-  DocModeProvider,
-  TelemetryProvider,
-} from '@blocksuite/affine-shared/services';
 import { unsafeCSSVar, unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
 import { SignalWatcher } from '@blocksuite/global/lit';
 import { DoneIcon } from '@blocksuite/icons/lit';
@@ -71,17 +67,6 @@ export class EmbedIframeLinkEditPopup extends SignalWatcher(
     }
   `;
 
-  protected override track(status: 'success' | 'failure') {
-    this.telemetryService?.track('EditLink', {
-      type: 'embed iframe block',
-      page: this.editorMode === 'page' ? 'doc editor' : 'whiteboard editor',
-      segment: 'editor',
-      module: 'embed block',
-      control: 'edit button',
-      other: status,
-    });
-  }
-
   override render() {
     const isInputEmpty = this.isInputEmpty();
     const { url$ } = this.model.props;
@@ -109,14 +94,4 @@ export class EmbedIframeLinkEditPopup extends SignalWatcher(
       </div>
     `;
   }
-
-  get telemetryService() {
-    return this.std.getOptional(TelemetryProvider);
-  }
-
-  get editorMode() {
-    const docModeService = this.std.get(DocModeProvider);
-    const mode = docModeService.getEditorMode();
-    return mode ?? 'page';
-  }
 }

blocksuite/affine/blocks/block-embed/src/embed-iframe-block/components/embed-iframe-link-input-base.ts

@@ -5,22 +5,11 @@ import {
 } from '@blocksuite/affine-shared/services';
 import { isValidUrl, stopPropagation } from '@blocksuite/affine-shared/utils';
 import { WithDisposable } from '@blocksuite/global/lit';
-import { noop } from '@blocksuite/global/utils';
-import {
-  BlockSelection,
-  type BlockStdScope,
-  SurfaceSelection,
-} from '@blocksuite/std';
+import { BlockSelection, type BlockStdScope } from '@blocksuite/std';
 import { LitElement } from 'lit';
 import { property, query, state } from 'lit/decorators.js';
 
 export class EmbedIframeLinkInputBase extends WithDisposable(LitElement) {
-  // this method is used to track the event when the user inputs the link
-  // it should be overridden by the subclass
-  protected track(status: 'success' | 'failure') {
-    noop(status);
-  }
-
   protected isInputEmpty() {
     return this._linkInputValue.trim() === '';
   }
@@ -44,20 +33,9 @@ export class EmbedIframeLinkInputBase extends WithDisposable(LitElement) {
     this.store.transact(() => {
       const blockId = this.store.addBlock(flavour, { url }, parent, index);
       this.store.deleteBlock(model);
-      if (this.inSurface) {
-        this.std.selection.setGroup('gfx', [
-          this.std.selection.create(
-            SurfaceSelection,
-            blockId,
-            [blockId],
-            false
-          ),
-        ]);
-      } else {
-        this.std.selection.setGroup('note', [
-          this.std.selection.create(BlockSelection, { blockId }),
-        ]);
-      }
+      this.std.selection.setGroup('note', [
+        this.std.selection.create(BlockSelection, { blockId }),
+      ]);
     });
 
     this.abortController?.abort();
@@ -72,7 +50,6 @@ export class EmbedIframeLinkInputBase extends WithDisposable(LitElement) {
       const embedIframeService = this.std.get(EmbedIframeService);
       if (!embedIframeService) {
         console.error('iframe EmbedIframeService not found');
-        this.track('failure');
         return;
       }
 
@@ -91,9 +68,7 @@ export class EmbedIframeLinkInputBase extends WithDisposable(LitElement) {
         title: '',
         description: '',
       });
-      this.track('success');
     } catch (error) {
-      this.track('failure');
       this.notificationService?.notify({
         title: 'Error in embed iframe creation',
         message: error instanceof Error ? error.message : 'Please try again',
@@ -154,7 +129,4 @@ export class EmbedIframeLinkInputBase extends WithDisposable(LitElement) {
 
   @property({ attribute: false })
   accessor abortController: AbortController | undefined = undefined;
-
-  @property({ attribute: false })
-  accessor inSurface = false;
 }

blocksuite/affine/blocks/block-embed/src/embed-iframe-block/components/embed-iframe-link-input-popup.ts

@@ -1,7 +1,3 @@
-import {
-  DocModeProvider,
-  TelemetryProvider,
-} from '@blocksuite/affine-shared/services';
 import { unsafeCSSVar, unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
 import { CloseIcon } from '@blocksuite/icons/lit';
 import { baseTheme } from '@toeverything/theme';
@@ -20,7 +16,6 @@ export type EmbedLinkInputPopupOptions = {
   title?: string;
   description?: string;
   placeholder?: string;
-  telemetrySegment?: string;
 };
 
 const DEFAULT_OPTIONS: EmbedLinkInputPopupOptions = {
@@ -29,7 +24,6 @@ const DEFAULT_OPTIONS: EmbedLinkInputPopupOptions = {
   title: 'Embed Link',
   description: 'Works with links of Google Drive, Spotify…',
   placeholder: 'Paste the Embed link...',
-  telemetrySegment: 'editor',
 };
 
 export class EmbedIframeLinkInputPopup extends EmbedIframeLinkInputBase {
@@ -41,6 +35,7 @@ export class EmbedIframeLinkInputPopup extends EmbedIframeLinkInputBase {
       border-radius: 8px;
       background: ${unsafeCSSVarV2('layer/background/overlayPanel')};
       box-shadow: ${unsafeCSSVar('overlayPanelShadow')};
+      z-index: var(--affine-z-index-modal);
       font-family: ${unsafeCSS(baseTheme.fontSansFamily)};
     }
 
@@ -221,17 +216,6 @@ export class EmbedIframeLinkInputPopup extends EmbedIframeLinkInputBase {
     this.abortController?.abort();
   };
 
-  protected override track(status: 'success' | 'failure') {
-    this.telemetryService?.track('CreateEmbedBlock', {
-      type: 'embed iframe block',
-      page: this.editorMode === 'page' ? 'doc editor' : 'whiteboard editor',
-      segment: this.options?.telemetrySegment ?? 'editor',
-      module: 'embed block',
-      control: 'confirm embed link',
-      other: status,
-    });
-  }
-
   override render() {
     const options = { ...DEFAULT_OPTIONS, ...this.options };
     const { showCloseButton, variant, title, description, placeholder } =
@@ -277,16 +261,6 @@ export class EmbedIframeLinkInputPopup extends EmbedIframeLinkInputBase {
     `;
   }
 
-  get telemetryService() {
-    return this.std.getOptional(TelemetryProvider);
-  }
-
-  get editorMode() {
-    const docModeService = this.std.get(DocModeProvider);
-    const mode = docModeService.getEditorMode();
-    return mode ?? 'page';
-  }
-
   @property({ attribute: false })
   accessor options: EmbedLinkInputPopupOptions | undefined = undefined;
 }

blocksuite/affine/blocks/block-embed/src/embed-iframe-block/configs/slash-menu/slash-menu.ts

@@ -1,4 +1,5 @@
 import { getSelectedModelsCommand } from '@blocksuite/affine-shared/commands';
+import { FeatureFlagService } from '@blocksuite/affine-shared/services';
 import type { SlashMenuConfig } from '@blocksuite/affine-widget-slash-menu';
 import { EmbedIcon } from '@blocksuite/icons/lit';
 
@@ -16,8 +17,12 @@ export const embedIframeSlashMenuConfig: SlashMenuConfig = {
         caption: 'Embed',
       },
       group: '4_Content & Media@5',
-      when: ({ model }) => {
-        return model.doc.schema.flavourSchemaMap.has('affine:embed-iframe');
+      when: ({ model, std }) => {
+        const featureFlagService = std.get(FeatureFlagService);
+        return (
+          featureFlagService.getFlag('enable_embed_iframe_block') &&
+          model.doc.schema.flavourSchemaMap.has('affine:embed-iframe')
+        );
       },
       action: ({ std }) => {
         std.command
@@ -26,9 +31,6 @@ export const embedIframeSlashMenuConfig: SlashMenuConfig = {
           .pipe(insertEmptyEmbedIframeCommand, {
             place: 'after',
             removeEmptyLine: true,
-            linkInputPopupOptions: {
-              telemetrySegment: 'slash menu',
-            },
           })
           .run();
       },

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

@@ -67,11 +67,6 @@ const openLinkAction = (id: string): ToolbarAction => {
     run(ctx) {
       const component = ctx.getCurrentBlockByType(EmbedIframeBlockComponent);
       component?.open();
-
-      ctx.track('OpenLink', {
-        ...trackBaseProps,
-        control: 'open original link',
-      });
     },
   };
 };
@@ -268,11 +263,6 @@ export const builtinToolbarConfig = {
               .copySlice(slice)
               .then(() => toast(ctx.host, 'Copied to clipboard'))
               .catch(console.error);
-
-            ctx.track('CopiedLink', {
-              ...trackBaseProps,
-              control: 'copy link',
-            });
           },
         },
         {
@@ -300,11 +290,6 @@ export const builtinToolbarConfig = {
       run(ctx) {
         const component = ctx.getCurrentBlockByType(EmbedIframeBlockComponent);
         component?.refreshData().catch(console.error);
-
-        ctx.track('ReloadLink', {
-          ...trackBaseProps,
-          control: 'reload link',
-        });
       },
     },
     {

blocksuite/affine/blocks/block-embed/src/embed-iframe-block/edgeless-clipboard-config.ts

@@ -1,37 +0,0 @@
-import { EdgelessClipboardConfig } from '@blocksuite/affine-block-surface';
-import { type BlockSnapshot } from '@blocksuite/store';
-
-export class EdgelessClipboardEmbedIframeConfig extends EdgelessClipboardConfig {
-  static override readonly key = 'affine:embed-iframe';
-
-  override createBlock(embedIframe: BlockSnapshot): string | null {
-    if (!this.surface) return null;
-    const {
-      xywh,
-      caption,
-      url,
-      title,
-      description,
-      iframeUrl,
-      scale,
-      width,
-      height,
-    } = embedIframe.props;
-
-    return this.crud.addBlock(
-      'affine:embed-iframe',
-      {
-        url,
-        iframeUrl,
-        xywh,
-        caption,
-        title,
-        description,
-        scale,
-        width,
-        height,
-      },
-      this.surface.model.id
-    );
-  }
-}

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

@@ -1,6 +1,7 @@
 import { EdgelessLegacySlotIdentifier } from '@blocksuite/affine-block-surface';
 import { Bound } from '@blocksuite/global/gfx';
 import { toGfxBlockComponent } from '@blocksuite/std';
+import { nothing } from 'lit';
 import { styleMap } from 'lit/directives/style-map.js';
 import { html } from 'lit/static-html.js';
 
@@ -35,6 +36,10 @@ export class EmbedEdgelessIframeBlockComponent extends toGfxBlockComponent(
   }
 
   override renderGfxBlock() {
+    if (!this.isEmbedIframeBlockEnabled) {
+      return nothing;
+    }
+
     const bound = Bound.deserialize(this.model.props.xywh$.value);
     const scale = this.model.props.scale$.value;
     const width = bound.w / scale;

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

@@ -8,6 +8,7 @@ import type { EmbedIframeBlockModel } from '@blocksuite/affine-model';
 import {
   type EmbedIframeData,
   EmbedIframeService,
+  FeatureFlagService,
   type IframeOptions,
   LinkPreviewerService,
   NotificationProvider,
@@ -22,7 +23,7 @@ import {
   type ReadonlySignal,
   signal,
 } from '@preact/signals-core';
-import { html } from 'lit';
+import { html, nothing } from 'lit';
 import { query } from 'lit/decorators.js';
 import { type ClassInfo, classMap } from 'lit/directives/class-map.js';
 import { ifDefined } from 'lit/directives/if-defined.js';
@@ -105,6 +106,12 @@ export class EmbedIframeBlockComponent extends CaptionedBlockComponent<EmbedIfra
     return matchModels(this.model.parent, [SurfaceBlockModel]);
   }
 
+  get isEmbedIframeBlockEnabled() {
+    const featureFlagService = this.doc.get(FeatureFlagService);
+    const flag = featureFlagService.getFlag('enable_embed_iframe_block');
+    return flag ?? false;
+  }
+
   get _horizontalCardHeight(): number {
     switch (this.status$.value) {
       case 'idle':
@@ -218,10 +225,12 @@ export class EmbedIframeBlockComponent extends CaptionedBlockComponent<EmbedIfra
         .model=${this.model}
         .abortController=${this._linkInputAbortController}
         .std=${this.std}
-        .inSurface=${this.inSurface}
         .options=${options}
       ></embed-iframe-link-input-popup>`,
-      container: document.body,
+      portalStyles: {
+        zIndex: 'var(--affine-z-index-popover)',
+      },
+      container: this.host,
       computePosition: {
         referenceElement: this._blockContainer,
         placement: 'bottom',
@@ -338,7 +347,6 @@ export class EmbedIframeBlockComponent extends CaptionedBlockComponent<EmbedIfra
         .model=${this.model}
         .onRetry=${this._handleRetry}
         .std=${this.std}
-        .inSurface=${this.inSurface}
         .options=${this._statusCardOptions}
       ></embed-iframe-error-card>`;
     }
@@ -413,6 +421,10 @@ export class EmbedIframeBlockComponent extends CaptionedBlockComponent<EmbedIfra
   }
 
   override renderBlock() {
+    if (!this.isEmbedIframeBlockEnabled) {
+      return nothing;
+    }
+
     const containerClasses = classMap({
       'affine-embed-iframe-block-container': true,
       ...this.selectedStyle$?.value,

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

@@ -5,7 +5,6 @@ export {
   EMBED_IFRAME_DEFAULT_HEIGHT_IN_SURFACE,
   EMBED_IFRAME_DEFAULT_WIDTH_IN_SURFACE,
 } from './consts';
-export * from './edgeless-clipboard-config';
 export * from './embed-iframe-block';
 export * from './embed-iframe-spec';
 export { canEmbedAsIframe } from './utils';

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

@@ -1,4 +1,7 @@
-import { EmbedIframeService } from '@blocksuite/affine-shared/services';
+import {
+  EmbedIframeService,
+  FeatureFlagService,
+} from '@blocksuite/affine-shared/services';
 import type { BlockStdScope } from '@blocksuite/std';
 
 /**
@@ -70,6 +73,8 @@ export function safeGetIframeSrc(htmlString: string): string | undefined {
  * @returns Whether the url can be embedded as an iframe
  */
 export function canEmbedAsIframe(std: BlockStdScope, url: string) {
+  const featureFlag = std.get(FeatureFlagService);
+  const isEmbedIframeEnabled = featureFlag.getFlag('enable_embed_iframe_block');
   const embedIframeService = std.get(EmbedIframeService);
-  return embedIframeService.canEmbed(url);
+  return isEmbedIframeEnabled && embedIframeService.canEmbed(url);
 }

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

@@ -11,7 +11,6 @@ import {
 } from '@blocksuite/affine-shared/consts';
 import {
   ActionPlacement,
-  DocDisplayMetaProvider,
   type LinkEventType,
   type OpenDocMode,
   type ToolbarAction,
@@ -77,13 +76,11 @@ const docTitleAction = {
     if (!model.props.title) return null;
 
     const originalTitle =
-      ctx.std.get(DocDisplayMetaProvider).title(model.props.pageId).value ||
-      'Untitled';
-    const open = (event: MouseEvent) => block.open({ event });
+      ctx.workspace.getDoc(model.props.pageId)?.meta?.title || 'Untitled';
 
     return html`<affine-linked-doc-title
       .title=${originalTitle}
-      .open=${open}
+      .open=${(event: MouseEvent) => block.open({ event })}
     ></affine-linked-doc-title>`;
   },
 } as const satisfies ToolbarAction;

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

@@ -1,31 +0,0 @@
-import { EdgelessClipboardConfig } from '@blocksuite/affine-block-surface';
-import { ReferenceInfoSchema } from '@blocksuite/affine-model';
-import { type BlockSnapshot } from '@blocksuite/store';
-
-export class EdgelessClipboardEmbedLinkedDocConfig extends EdgelessClipboardConfig {
-  static override readonly key = 'affine:embed-linked-doc';
-
-  override createBlock(linkedDocEmbed: BlockSnapshot): string | null {
-    if (!this.surface) return null;
-
-    const { xywh, style, caption, pageId, params, title, description } =
-      linkedDocEmbed.props;
-    const referenceInfo = ReferenceInfoSchema.parse({
-      pageId,
-      params,
-      title,
-      description,
-    });
-
-    return this.crud.addBlock(
-      'affine:embed-linked-doc',
-      {
-        xywh,
-        style,
-        caption,
-        ...referenceInfo,
-      },
-      this.surface.model.id
-    );
-  }
-}

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

@@ -1,6 +1,5 @@
 export * from './adapters';
 export * from './commands';
 export { LinkedDocSlashMenuConfigIdentifier } from './configs/slash-menu';
-export * from './edgeless-clipboard-config';
 export * from './embed-linked-doc-block';
 export * from './embed-linked-doc-spec';

blocksuite/affine/blocks/block-embed/src/embed-loom-block/configs/slash-menu.ts

@@ -2,18 +2,12 @@ import { toggleEmbedCardCreateModal } from '@blocksuite/affine-components/embed-
 import type { SlashMenuConfig } from '@blocksuite/affine-widget-slash-menu';
 import { LoomLogoDuotoneIcon } from '@blocksuite/icons/lit';
 
-import { LoomTooltip } from './tooltips';
-
 export const embedLoomSlashMenuConfig: SlashMenuConfig = {
   items: [
     {
       name: 'Loom',
       icon: LoomLogoDuotoneIcon(),
       description: 'Embed a Loom video.',
-      tooltip: {
-        figure: LoomTooltip,
-        caption: 'loom',
-      },
       group: '4_Content & Media@9',
       when: ({ model }) =>
         model.doc.schema.flavourSchemaMap.has('affine:embed-loom'),

blocksuite/affine/blocks/block-embed/src/embed-loom-block/edgeless-clipboard-config.ts

@@ -1,28 +0,0 @@
-import { EdgelessClipboardConfig } from '@blocksuite/affine-block-surface';
-import { type BlockSnapshot } from '@blocksuite/store';
-
-export class EdgelessClipboardEmbedLoomConfig extends EdgelessClipboardConfig {
-  static override readonly key = 'affine:embed-loom';
-
-  override createBlock(loomEmbed: BlockSnapshot): string | null {
-    if (!this.surface) return null;
-    const { xywh, style, url, caption, videoId, image, title, description } =
-      loomEmbed.props;
-
-    const embedLoomId = this.crud.addBlock(
-      'affine:embed-loom',
-      {
-        xywh,
-        style,
-        url,
-        caption,
-        videoId,
-        image,
-        title,
-        description,
-      },
-      this.surface.model.id
-    );
-    return embedLoomId;
-  }
-}

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

@@ -1,5 +1,4 @@
 export * from './adapters/index.js';
-export * from './edgeless-clipboard-config';
 export * from './embed-loom-block.js';
 export * from './embed-loom-model.js';
 export * from './embed-loom-service.js';

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

@@ -1,27 +0,0 @@
-import { EdgelessClipboardConfig } from '@blocksuite/affine-block-surface';
-import { ReferenceInfoSchema } from '@blocksuite/affine-model';
-import { type BlockSnapshot } from '@blocksuite/store';
-
-export class EdgelessClipboardEmbedSyncedDocConfig extends EdgelessClipboardConfig {
-  static override readonly key = 'affine:embed-synced-doc';
-
-  override createBlock(syncedDocEmbed: BlockSnapshot): string | null {
-    if (!this.surface) return null;
-
-    const { xywh, style, caption, scale, pageId, params } =
-      syncedDocEmbed.props;
-    const referenceInfo = ReferenceInfoSchema.parse({ pageId, params });
-
-    return this.crud.addBlock(
-      'affine:embed-synced-doc',
-      {
-        xywh,
-        style,
-        caption,
-        scale,
-        ...referenceInfo,
-      },
-      this.surface.model.id
-    );
-  }
-}

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

@@ -1,5 +1,4 @@
 export * from './adapters/index.js';
-export * from './edgeless-clipboard-config';
 export * from './embed-synced-doc-block.js';
 export * from './embed-synced-doc-spec.js';
 export { SYNCED_MIN_HEIGHT, SYNCED_MIN_WIDTH } from './styles.js';

blocksuite/affine/blocks/block-embed/src/embed-youtube-block/edgeless-clipboard-config.ts

@@ -1,42 +0,0 @@
-import { EdgelessClipboardConfig } from '@blocksuite/affine-block-surface';
-import { type BlockSnapshot } from '@blocksuite/store';
-
-export class EdgelessClipboardEmbedYoutubeConfig extends EdgelessClipboardConfig {
-  static override readonly key = 'affine:embed-youtube';
-
-  override createBlock(youtubeEmbed: BlockSnapshot): string | null {
-    if (!this.surface) return null;
-    const {
-      xywh,
-      style,
-      url,
-      caption,
-      videoId,
-      image,
-      title,
-      description,
-      creator,
-      creatorUrl,
-      creatorImage,
-    } = youtubeEmbed.props;
-
-    const embedYoutubeId = this.crud.addBlock(
-      'affine:embed-youtube',
-      {
-        xywh,
-        style,
-        url,
-        caption,
-        videoId,
-        image,
-        title,
-        description,
-        creator,
-        creatorUrl,
-        creatorImage,
-      },
-      this.surface.model.id
-    );
-    return embedYoutubeId;
-  }
-}

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

@@ -1,5 +1,4 @@
 export * from './adapters/index.js';
-export * from './edgeless-clipboard-config';
 export * from './embed-youtube-block.js';
 export * from './embed-youtube-model.js';
 export * from './embed-youtube-service.js';

blocksuite/affine/blocks/block-frame/package.json

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

blocksuite/affine/blocks/block-frame/src/edgeless-clipboard-config.ts

@@ -1,43 +0,0 @@
-import {
-  type ClipboardConfigCreationContext,
-  EdgelessClipboardConfig,
-} from '@blocksuite/affine-block-surface';
-import { type BlockSnapshot, fromJSON } from '@blocksuite/store';
-
-export class EdgelessClipboardFrameConfig extends EdgelessClipboardConfig {
-  static override readonly key = 'affine:frame';
-
-  override createBlock(
-    frame: BlockSnapshot,
-    context: ClipboardConfigCreationContext
-  ): string | null {
-    if (!this.surface) return null;
-
-    const { oldToNewIdMap, newPresentationIndexes } = context;
-    const { xywh, title, background, childElementIds } = frame.props;
-
-    const newChildElementIds: Record<string, boolean> = {};
-
-    if (typeof childElementIds === 'object' && childElementIds !== null) {
-      Object.keys(childElementIds).forEach(oldId => {
-        const newId = oldToNewIdMap.get(oldId);
-        if (newId) {
-          newChildElementIds[newId] = true;
-        }
-      });
-    }
-
-    const frameId = this.crud.addBlock(
-      'affine:frame',
-      {
-        xywh,
-        background,
-        title: fromJSON(title),
-        childElementIds: newChildElementIds,
-        presentationIndex: newPresentationIndexes.get(frame.id),
-      },
-      this.surface.model.id
-    );
-    return frameId;
-  }
-}

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

@@ -38,7 +38,9 @@ export class FrameTool extends BaseTool {
   override dragEnd(): void {
     if (this._frame) {
       const frame = this._frame;
-      frame.pop('xywh');
+      this.doc.transact(() => {
+        frame.pop('xywh');
+      });
       // @ts-expect-error TODO: refactor gfx tool
       this.gfx.tool.setTool('default');
       this.gfx.selection.set({
@@ -50,6 +52,8 @@ export class FrameTool extends BaseTool {
         frame,
         getTopElements(this.frameManager.getElementsInFrameBound(frame))
       );
+
+      this.doc.captureSync();
     }
 
     this._frame = null;

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

@@ -1,7 +1,6 @@
 import type { FrameTool } from './frame-tool';
 import type { PresentTool, PresentToolOption } from './preset-tool';
 
-export * from './edgeless-clipboard-config';
 export * from './edgeless-toolbar';
 export * from './frame-block';
 export * from './frame-highlight-manager';

blocksuite/affine/blocks/block-image/package.json

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

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

@@ -1,121 +1,19 @@
 import { ImageBlockModel } from '@blocksuite/affine-model';
 import {
-  ActionPlacement,
   type ToolbarModuleConfig,
   ToolbarModuleExtension,
 } from '@blocksuite/affine-shared/services';
-import {
-  BookmarkIcon,
-  CaptionIcon,
-  CopyIcon,
-  DeleteIcon,
-  DownloadIcon,
-  DuplicateIcon,
-} from '@blocksuite/icons/lit';
+import { CaptionIcon, DownloadIcon } from '@blocksuite/icons/lit';
 import { BlockFlavourIdentifier } from '@blocksuite/std';
 import type { ExtensionType } from '@blocksuite/store';
 
-import { ImageBlockComponent } from '../image-block';
 import { ImageEdgelessBlockComponent } from '../image-edgeless-block';
-import { duplicate } from '../utils';
 
 const trackBaseProps = {
   category: 'image',
   type: 'card view',
 };
 
-const builtinToolbarConfig = {
-  actions: [
-    {
-      id: 'a.download',
-      tooltip: 'Download',
-      icon: DownloadIcon(),
-      run(ctx) {
-        const block = ctx.getCurrentBlockByType(ImageBlockComponent);
-        block?.download();
-      },
-    },
-    {
-      id: 'b.caption',
-      tooltip: 'Caption',
-      icon: CaptionIcon(),
-      run(ctx) {
-        const block = ctx.getCurrentBlockByType(ImageBlockComponent);
-        block?.captionEditor?.show();
-
-        ctx.track('OpenedCaptionEditor', {
-          ...trackBaseProps,
-          control: 'add caption',
-        });
-      },
-    },
-    {
-      placement: ActionPlacement.More,
-      id: 'a.clipboard',
-      actions: [
-        {
-          id: 'a.copy',
-          label: 'Copy',
-          icon: CopyIcon(),
-          run(ctx) {
-            const block = ctx.getCurrentBlockByType(ImageBlockComponent);
-            block?.copy();
-          },
-        },
-        {
-          id: 'b.duplicate',
-          label: 'Duplicate',
-          icon: DuplicateIcon(),
-          run(ctx) {
-            const block = ctx.getCurrentBlockByType(ImageBlockComponent);
-            if (!block) return;
-
-            duplicate(block);
-          },
-        },
-      ],
-    },
-    {
-      placement: ActionPlacement.More,
-      id: 'b.conversions',
-      actions: [
-        {
-          id: 'a.turn-into-card-view',
-          label: 'Turn into card view',
-          icon: BookmarkIcon(),
-          when(ctx) {
-            const supported =
-              ctx.store.schema.flavourSchemaMap.has('affine:attachment');
-            if (!supported) return false;
-
-            const block = ctx.getCurrentBlockByType(ImageBlockComponent);
-            return Boolean(block?.blob);
-          },
-          run(ctx) {
-            const block = ctx.getCurrentBlockByType(ImageBlockComponent);
-            block?.convertToCardView();
-          },
-        },
-      ],
-    },
-    {
-      placement: ActionPlacement.More,
-      id: 'c.delete',
-      label: 'Delete',
-      icon: DeleteIcon(),
-      variant: 'destructive',
-      run(ctx) {
-        const block = ctx.getCurrentBlockByType(ImageBlockComponent);
-        if (!block) return;
-
-        ctx.store.deleteBlock(block.model);
-      },
-    },
-  ],
-
-  placement: 'inner',
-} as const satisfies ToolbarModuleConfig;
-
 const builtinSurfaceToolbarConfig = {
   actions: [
     {
@@ -152,11 +50,6 @@ export const createBuiltinToolbarConfigExtension = (
   const name = flavour.split(':').pop();
 
   return [
-    ToolbarModuleExtension({
-      id: BlockFlavourIdentifier(flavour),
-      config: builtinToolbarConfig,
-    }),
-
     ToolbarModuleExtension({
       id: BlockFlavourIdentifier(`affine:surface:${name}`),
       config: builtinSurfaceToolbarConfig,

blocksuite/affine/blocks/block-image/src/edgeless-clipboard-config.ts

@@ -1,30 +0,0 @@
-import { EdgelessClipboardConfig } from '@blocksuite/affine-block-surface';
-import { type BlockSnapshot } from '@blocksuite/store';
-
-export class EdgelessClipboardImageConfig extends EdgelessClipboardConfig {
-  static override readonly key = 'affine:image';
-
-  override async createBlock(image: BlockSnapshot) {
-    const { xywh, rotate, sourceId, size, width, height, caption } =
-      image.props;
-
-    if (!this.surface) return null;
-
-    if (!(await this.std.workspace.blobSync.get(sourceId as string))) {
-      return null;
-    }
-    return this.crud.addBlock(
-      'affine:image',
-      {
-        caption,
-        sourceId,
-        xywh,
-        rotate,
-        size,
-        width,
-        height,
-      },
-      this.surface.model.id
-    );
-  }
-}

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

@@ -1,8 +1,6 @@
 import { CaptionedBlockComponent } from '@blocksuite/affine-components/caption';
-import { whenHover } from '@blocksuite/affine-components/hover';
 import { Peekable } from '@blocksuite/affine-components/peek';
 import type { ImageBlockModel } from '@blocksuite/affine-model';
-import { ToolbarRegistryIdentifier } from '@blocksuite/affine-shared/services';
 import { IS_MOBILE } from '@blocksuite/global/env';
 import { BlockSelection } from '@blocksuite/std';
 import { html } from 'lit';
@@ -56,29 +54,6 @@ export class ImageBlockComponent extends CaptionedBlockComponent<ImageBlockModel
     selectionManager.setGroup('note', [blockSelection]);
   }
 
-  private _initHover() {
-    const { setReference, setFloating, dispose } = whenHover(
-      hovered => {
-        const message$ = this.std.get(ToolbarRegistryIdentifier).message$;
-        if (hovered) {
-          message$.value = {
-            flavour: this.model.flavour,
-            element: this,
-            setFloating,
-          };
-          return;
-        }
-
-        // Clears previous bindings
-        message$.value = null;
-        setFloating();
-      },
-      { enterDelay: 500 }
-    );
-    setReference(this.hoverableContainer);
-    this._disposables.add(dispose);
-  }
-
   override connectedCallback() {
     super.connectedCallback();
 
@@ -103,7 +78,6 @@ export class ImageBlockComponent extends CaptionedBlockComponent<ImageBlockModel
   override firstUpdated() {
     // lazy bindings
     this.disposables.addFromEvent(this, 'click', this._handleClick);
-    this._initHover();
   }
 
   override renderBlock() {
@@ -160,9 +134,6 @@ export class ImageBlockComponent extends CaptionedBlockComponent<ImageBlockModel
   @query('affine-page-image')
   private accessor pageImage: ImageBlockPageComponent | null = null;
 
-  @query('.affine-image-container')
-  accessor hoverableContainer!: HTMLDivElement;
-
   @property({ attribute: false })
   accessor retryCount = 0;
 

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

@@ -1,6 +1,10 @@
 import { ImageBlockSchema } from '@blocksuite/affine-model';
 import { SlashMenuConfigExtension } from '@blocksuite/affine-widget-slash-menu';
-import { BlockViewExtension, FlavourExtension } from '@blocksuite/std';
+import {
+  BlockViewExtension,
+  FlavourExtension,
+  WidgetViewExtension,
+} from '@blocksuite/std';
 import type { ExtensionType } from '@blocksuite/store';
 import { literal } from 'lit/static-html.js';
 
@@ -12,6 +16,12 @@ import { ImageDropOption } from './image-service';
 
 const flavour = ImageBlockSchema.model.flavour;
 
+export const imageToolbarWidget = WidgetViewExtension(
+  flavour,
+  'imageToolbar',
+  literal`affine-image-toolbar-widget`
+);
+
 export const ImageBlockSpec: ExtensionType[] = [
   FlavourExtension(flavour),
   BlockViewExtension(flavour, model => {
@@ -23,6 +33,7 @@ export const ImageBlockSpec: ExtensionType[] = [
 
     return literal`affine-image`;
   }),
+  imageToolbarWidget,
   ImageDropOption,
   ImageBlockAdapterExtensions,
   createBuiltinToolbarConfigExtension(flavour),

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

@@ -1,6 +1,5 @@
 export * from './adapters';
 export * from './commands';
-export * from './edgeless-clipboard-config';
 export * from './image-block';
 export * from './image-edgeless-block';
 export { ImageProxyService } from './image-proxy-service';

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

@@ -11,19 +11,13 @@ import {
 } from '@blocksuite/affine-shared/services';
 import {
   downloadBlob,
-  getBlockProps,
   humanFileSize,
-  isInsidePageEditor,
   readImageSize,
   transformModel,
   withTempBlobData,
 } from '@blocksuite/affine-shared/utils';
 import { Bound, type IVec, Point, Vec } from '@blocksuite/global/gfx';
-import {
-  BlockSelection,
-  type BlockStdScope,
-  type EditorHost,
-} from '@blocksuite/std';
+import type { BlockStdScope, EditorHost } from '@blocksuite/std';
 import { GfxControllerIdentifier } from '@blocksuite/std/gfx';
 import type { BlockModel } from '@blocksuite/store';
 
@@ -558,49 +552,3 @@ export function calcBoundByOrigin(
     ? new Bound(point[0], point[1], width, height)
     : Bound.fromCenter(point, width, height);
 }
-
-export function duplicate(block: ImageBlockComponent) {
-  const model = block.model;
-  const blockProps = getBlockProps(model);
-  const {
-    width: _width,
-    height: _height,
-    xywh: _xywh,
-    rotate: _rotate,
-    zIndex: _zIndex,
-    ...duplicateProps
-  } = blockProps;
-
-  const { doc } = model;
-  const parent = doc.getParent(model);
-  if (!parent) {
-    console.error(`Parent not found for block(${model.flavour}) ${model.id}`);
-    return;
-  }
-
-  const index = parent?.children.indexOf(model);
-  const duplicateId = doc.addBlock(
-    model.flavour,
-    duplicateProps,
-    parent,
-    index + 1
-  );
-
-  const editorHost = block.host;
-  editorHost.updateComplete
-    .then(() => {
-      const { selection } = editorHost;
-      selection.setGroup('note', [
-        selection.create(BlockSelection, {
-          blockId: duplicateId,
-        }),
-      ]);
-      if (isInsidePageEditor(editorHost)) {
-        const duplicateElement = editorHost.view.getBlock(duplicateId);
-        if (duplicateElement) {
-          duplicateElement.scrollIntoView(true);
-        }
-      }
-    })
-    .catch(console.error);
-}

blocksuite/affine/blocks/block-latex/package.json

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

blocksuite/affine/blocks/block-latex/src/configs/slash-menu.ts

@@ -7,7 +7,6 @@ import { type SlashMenuConfig } from '@blocksuite/affine-widget-slash-menu';
 import { TeXIcon } from '@blocksuite/icons/lit';
 
 import { insertLatexBlockCommand } from '../commands';
-import { LatexTooltip } from './tooltips';
 
 export const latexSlashMenuConfig: SlashMenuConfig = {
   items: [
@@ -16,14 +15,6 @@ export const latexSlashMenuConfig: SlashMenuConfig = {
       group: '0_Basic@8',
       description: 'Create a inline equation.',
       icon: TeXIcon(),
-      tooltip: {
-        figure: LatexTooltip(
-          'Energy. Mass. Light. In a single equation,',
-          'E=mc^2',
-          false
-        ),
-        caption: 'Inline equation',
-      },
       searchAlias: ['inlineMath, inlineEquation', 'inlineLatex'],
       action: ({ std }) => {
         std.command
@@ -37,14 +28,6 @@ export const latexSlashMenuConfig: SlashMenuConfig = {
       name: 'Equation',
       description: 'Create a equation block.',
       icon: TeXIcon(),
-      tooltip: {
-        figure: LatexTooltip(
-          'Create a equation via LaTeX.',
-          String.raw`\frac{a}{b} \pm \frac{c}{d} = \frac{ad \pm bc}{bd}`,
-          true
-        ),
-        caption: 'Equation',
-      },
       searchAlias: ['mathBlock, equationBlock', 'latexBlock'],
       group: '4_Content & Media@10',
       action: ({ std }) => {

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

@@ -1,41 +0,0 @@
-import { unsafeCSSVarV2 } from '@blocksuite/affine-shared/theme';
-import katex from 'katex';
-import { html } from 'lit';
-import { unsafeHTML } from 'lit/directives/unsafe-html.js';
-
-export const LatexTooltip = (
-  str: string,
-  latex: string,
-  displayMode: boolean = false
-) =>
-  html` <style>
-      .latex-tooltip {
-        background: ${unsafeCSSVarV2('layer/pureWhite')};
-        border-radius: 2px;
-        width: 170px;
-        padding: 5px 5px 5px 6px;
-        box-sizing: border-box;
-      }
-      .latex-tooltip-content {
-        width: 159px;
-        color: #121212;
-        font-family: var(--affine-font-family);
-        font-size: 10px;
-        font-style: normal;
-
-        .katex > math[display='block'] {
-          margin-top: 1em;
-        }
-      }
-    </style>
-    <div class="latex-tooltip">
-      <div class="latex-tooltip-content">
-        <span>${str}</span>
-        ${unsafeHTML(
-          katex.renderToString(latex, {
-            displayMode,
-            output: 'mathml',
-          })
-        )}
-      </div>
-    </div>`;

blocksuite/affine/blocks/block-list/package.json

@@ -17,7 +17,7 @@
     "@blocksuite/affine-rich-text": "workspace:*",
     "@blocksuite/affine-shared": "workspace:*",
     "@blocksuite/global": "workspace:*",
-    "@blocksuite/icons": "^2.2.10",
+    "@blocksuite/icons": "^2.2.8",
     "@blocksuite/std": "workspace:*",
     "@blocksuite/store": "workspace:*",
     "@floating-ui/dom": "^1.6.13",
@@ -31,7 +31,7 @@
     "zod": "^3.23.8"
   },
   "devDependencies": {
-    "vitest": "3.1.1"
+    "vitest": "3.0.9"
   },
   "exports": {
     ".": "./src/index.ts",

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

@@ -8,7 +8,7 @@ import type { ListBlockModel } from '@blocksuite/affine-model';
 import type { RichText } from '@blocksuite/affine-rich-text';
 import {
   BLOCK_CHILDREN_CONTAINER_PADDING_LEFT,
-  EDGELESS_TOP_CONTENTEDITABLE_SELECTOR,
+  NOTE_SELECTOR,
 } from '@blocksuite/affine-shared/consts';
 import { DocModeProvider } from '@blocksuite/affine-shared/services';
 import { getViewportElement } from '@blocksuite/affine-shared/utils';
@@ -84,9 +84,7 @@ export class ListBlockComponent extends CaptionedBlockComponent<ListBlockModel>
 
   override get topContenteditableElement() {
     if (this.std.get(DocModeProvider).getEditorMode() === 'edgeless') {
-      return this.closest<BlockComponent>(
-        EDGELESS_TOP_CONTENTEDITABLE_SELECTOR
-      );
+      return this.closest<BlockComponent>(NOTE_SELECTOR);
     }
     return this.rootComponent;
   }

blocksuite/affine/blocks/block-note/package.json

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

blocksuite/affine/blocks/block-note/src/configs/toolbar.ts

@@ -110,8 +110,8 @@ const builtinSurfaceToolbarConfig = {
         );
         const label$ = computed(() =>
           firstModel.props.displayMode$.value === NoteDisplayMode.EdgelessOnly
-            ? 'Display in Page'
-            : 'Displayed in Page'
+            ? 'Display In Page'
+            : 'Displayed In Page'
         );
         const onSelect = () => {
           const newMode =
@@ -547,7 +547,7 @@ function setDisplayMode(
   const notification = ctx.std.getOptional(NotificationProvider);
   notification?.notify({
     title: data.title,
-    message: `${data.message} Find it in the TOC for quick navigation.`,
+    message: `${data.message}. Find it in the TOC for quick navigation.`,
     accent: 'success',
     duration: 5 * 1000,
     footer: html`<div class=${styles.viewInPageNotifyFooter}>

blocksuite/affine/blocks/block-note/src/configs/tooltips.ts

@@ -227,21 +227,6 @@ export const UnderlineTooltip = html`<svg width="170" height="68" viewBox="0 0 1
 </svg>
 `;
 
-// prettier-ignore
-export const TodoTooltip = html`<svg width="170" height="68" viewBox="0 0 170 68" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="170" height="68" rx="2" fill="white"/>
-<mask id="mask0_5604_203551" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="170" height="68">
-<rect width="170" height="68" rx="2" fill="white"/>
-</mask>
-<g mask="url(#mask0_5604_203551)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M13.6667 19C12.7462 19 12 19.7462 12 20.6667V27.3333C12 28.2538 12.7462 29 13.6667 29H20.3333C21.2538 29 22 28.2538 22 27.3333V20.6667C22 19.7462 21.2538 19 20.3333 19H13.6667ZM12.9091 20.6667C12.9091 20.2483 13.2483 19.9091 13.6667 19.9091H20.3333C20.7517 19.9091 21.0909 20.2483 21.0909 20.6667V27.3333C21.0909 27.7517 20.7517 28.0909 20.3333 28.0909H13.6667C13.2483 28.0909 12.9091 27.7517 12.9091 27.3333V20.6667Z" fill="#77757D"/>
-<text fill="#121212" xml:space="preserve" style="white-space: pre" font-family="Inter" font-size="10" letter-spacing="0px"><tspan x="28" y="27.6364">Here is an example of todo list.</tspan></text>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12 40.6667C12 39.7462 12.7462 39 13.6667 39H20.3333C21.2538 39 22 39.7462 22 40.6667V47.3333C22 48.2538 21.2538 49 20.3333 49H13.6667C12.7462 49 12 48.2538 12 47.3333V40.6667ZM19.7457 42.5032C19.9232 42.3257 19.9232 42.0379 19.7457 41.8604C19.5681 41.6829 19.2803 41.6829 19.1028 41.8604L16.0909 44.8723L15.2002 43.9816C15.0227 43.8041 14.7349 43.8041 14.5574 43.9816C14.3799 44.1591 14.3799 44.4469 14.5574 44.6244L15.7695 45.8366C15.947 46.0141 16.2348 46.0141 16.4123 45.8366L19.7457 42.5032Z" fill="#1E96EB"/>
-<text fill="#8E8D91" xml:space="preserve" style="white-space: pre" font-family="Inter" font-size="10" letter-spacing="0px"><tspan x="28" y="47.6364">Make a list for building preview.</tspan></text>
-</g>
-</svg>
-`
-
 export const tooltips: Record<string, SlashMenuTooltip> = {
   Text: {
     figure: TextTooltip,
@@ -322,9 +307,4 @@ export const tooltips: Record<string, SlashMenuTooltip> = {
     figure: StrikethroughTooltip,
     caption: 'Strikethrough',
   },
-
-  'To-do List': {
-    figure: TodoTooltip,
-    caption: 'To-do List',
-  },
 };

blocksuite/affine/blocks/block-note/src/edgeless-clipboard-config.ts

@@ -1,28 +0,0 @@
-import { EdgelessClipboardConfig } from '@blocksuite/affine-block-surface';
-import { type BlockSnapshot } from '@blocksuite/store';
-
-export class EdgelessClipboardNoteConfig extends EdgelessClipboardConfig {
-  static override readonly key = 'affine:note';
-
-  override async createBlock(note: BlockSnapshot): Promise<null | string> {
-    const oldId = note.id;
-
-    delete note.props.index;
-    if (!note.props.xywh) {
-      console.error(`Note block(id: ${oldId}) does not have xywh property`);
-      return null;
-    }
-
-    const newId = await this.onBlockSnapshotPaste(
-      note,
-      this.std.store,
-      this.std.store.root!.id
-    );
-    if (!newId) {
-      console.error(`Failed to paste note block(id: ${oldId})`);
-      return null;
-    }
-
-    return newId;
-  }
-}

blocksuite/affine/blocks/block-note/src/index.ts

@@ -2,7 +2,6 @@ export * from './adapters';
 export * from './commands';
 export * from './components/edgeless-note-background';
 export * from './config';
-export * from './edgeless-clipboard-config';
 export * from './note-block';
 export * from './note-edgeless-block';
 export * from './note-spec';

blocksuite/affine/blocks/block-note/src/note-edgeless-block.ts

@@ -268,10 +268,7 @@ export class EdgelessNoteBlockComponent extends toGfxBlockComponent(
             <edgeless-page-block-title
               .note=${this.model}
             ></edgeless-page-block-title>
-            <div
-              contenteditable=${String(!this.doc.readonly$.value)}
-              class="edgeless-note-page-content"
-            >
+            <div class="edgeless-note-page-content">
               ${this.renderPageContent()}
             </div>
           </div>

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

@@ -5,7 +5,7 @@ import type { ParagraphBlockModel } from '@blocksuite/affine-model';
 import type { RichText } from '@blocksuite/affine-rich-text';
 import {
   BLOCK_CHILDREN_CONTAINER_PADDING_LEFT,
-  EDGELESS_TOP_CONTENTEDITABLE_SELECTOR,
+  NOTE_SELECTOR,
 } from '@blocksuite/affine-shared/consts';
 import { DocModeProvider } from '@blocksuite/affine-shared/services';
 import {
@@ -96,9 +96,7 @@ export class ParagraphBlockComponent extends CaptionedBlockComponent<ParagraphBl
 
   override get topContenteditableElement() {
     if (this.std.get(DocModeProvider).getEditorMode() === 'edgeless') {
-      return this.closest<BlockComponent>(
-        EDGELESS_TOP_CONTENTEDITABLE_SELECTOR
-      );
+      return this.closest<BlockComponent>(NOTE_SELECTOR);
     }
     return this.rootComponent;
   }