Merge branch 'canary' into fix/issue-11515

fix(edgeless): accept persisted shape proxy when mounting text editor
fix(edgeless): guard null shape element when mounting text editor
2026-03-25 16:48:50 +08:00 · 2026-03-11 15:08:09 +08:00 · 2026-02-27 16:10:30 +08:00 · 2026-02-27 10:55:42 +08:00 · 2026-02-26 15:26:18 +08:00 · 2026-02-26 15:14:23 +08:00
12 changed files with 1104 additions and 1247 deletions
--- a/blocksuite/affine/gfx/shape/src/text/edgeless-shape-text-editor.ts
+++ b/blocksuite/affine/gfx/shape/src/text/edgeless-shape-text-editor.ts
@@ -3,11 +3,8 @@ import {
  EdgelessCRUDIdentifier,
  TextUtils,
 } from '@blocksuite/affine-block-surface';
-import {
-  MindmapElementModel,
-  ShapeElementModel,
-  TextResizing,
-} from '@blocksuite/affine-model';
+import type { ShapeElementModel } from '@blocksuite/affine-model';
+import { MindmapElementModel, TextResizing } from '@blocksuite/affine-model';
 import type { RichText } from '@blocksuite/affine-rich-text';
 import { ThemeProvider } from '@blocksuite/affine-shared/services';
 import { getSelectedRect } from '@blocksuite/affine-shared/utils';
@@ -29,7 +26,7 @@ import { styleMap } from 'lit/directives/style-map.js';
 import * as Y from 'yjs';

 export function mountShapeTextEditor(
-  shapeElement: ShapeElementModel,
+  shapeElement: { id: string; text?: Y.Text } | null | undefined,
  edgeless: BlockComponent
 ) {
  const mountElm = edgeless.querySelector('.edgeless-mount-point');
@@ -43,24 +40,27 @@ export function mountShapeTextEditor(
  const gfx = edgeless.std.get(GfxControllerIdentifier);
  const crud = edgeless.std.get(EdgelessCRUDIdentifier);

+  if (!shapeElement?.id) {
+    console.error('Cannot mount text editor on an invalid shape element');
+    return;
+  }
+
  const updatedElement = crud.getElementById(shapeElement.id);

-  if (!(updatedElement instanceof ShapeElementModel)) {
+  if (!updatedElement || !('id' in updatedElement)) {
    console.error('Cannot mount text editor on a non-shape element');
    return;
  }

  gfx.tool.setTool(DefaultTool);
  gfx.selection.set({
-    elements: [shapeElement.id],
+    elements: [updatedElement.id],
    editing: true,
  });

-  if (!shapeElement.text) {
+  if (!updatedElement.text) {
    const text = new Y.Text();
-    edgeless.std
-      .get(EdgelessCRUDIdentifier)
-      .updateElement(shapeElement.id, { text });
+    crud.updateElement(updatedElement.id, { text });
  }

  const shapeEditor = new EdgelessShapeTextEditor();
@@ -280,6 +280,21 @@ export class EdgelessShapeTextEditor extends WithDisposable(ShadowlessElement) {
            this._unmount();
          }
        );
+
+        this.disposables.addFromEvent(
+          this.inlineEditorContainer,
+          'compositionupdate',
+          () => {
+            this._updateElementWH();
+          }
+        );
+        this.disposables.addFromEvent(
+          this.inlineEditorContainer,
+          'compositionend',
+          () => {
+            this._updateElementWH();
+          }
+        );
      })
      .catch(console.error);

--- a/blocksuite/affine/shared/src/utils/print-to-pdf.ts
+++ b/blocksuite/affine/shared/src/utils/print-to-pdf.ts
@@ -17,14 +17,7 @@ export async function printToPdf(
  return new Promise<void>((resolve, reject) => {
    const iframe = document.createElement('iframe');
    document.body.append(iframe);
-    // Use a hidden but rendering-enabled state instead of display: none
-    Object.assign(iframe.style, {
-      visibility: 'hidden',
-      position: 'absolute',
-      width: '0',
-      height: '0',
-      border: 'none',
-    });
+    iframe.style.display = 'none';
    iframe.srcdoc = '<!DOCTYPE html>';
    iframe.onload = async () => {
      if (!iframe.contentWindow) {
@@ -35,44 +28,6 @@ export async function printToPdf(
        reject(new Error('Root element not defined, unable to print pdf'));
        return;
      }
-
-      const doc = iframe.contentWindow.document;
-
-      doc.write(`<!DOCTYPE html><html><head><style>@media print {
-                html, body {
-                  height: initial !important;
-                  overflow: initial !important;
-                  print-color-adjust: exact;
-                  -webkit-print-color-adjust: exact;
-                  color: #000 !important;
-                  background: #fff !important;
-                  color-scheme: light !important;
-                }
-                ::-webkit-scrollbar { 
-                  display: none; 
-                }
-                :root, body {
-                  --affine-text-primary: #000 !important;
-                  --affine-text-secondary: #111 !important;
-                  --affine-text-tertiary: #333 !important;
-                  --affine-background-primary: #fff !important;
-                  --affine-background-secondary: #fff !important;
-                  --affine-background-tertiary: #fff !important;
-                }
-                body, [data-theme='dark'] {
-                  color: #000 !important;
-                  background: #fff !important;
-                }
-                body * {
-                  color: #000 !important;
-                  -webkit-text-fill-color: #000 !important;
-                }
-                :root {
-                  --affine-note-shadow-box: none !important;
-                  --affine-note-shadow-sticker: none !important;
-                }
-              }</style></head><body></body></html>`);
-      doc.close();
      iframe.contentWindow.document
        .write(`<!DOCTYPE html><html><head><style>@media print {
              html, body {
@@ -116,7 +71,7 @@ export async function printToPdf(
      for (const element of document.styleSheets) {
        try {
          for (const cssRule of element.cssRules) {
-            const target = doc.styleSheets[0];
+            const target = iframe.contentWindow.document.styleSheets[0];
            target.insertRule(cssRule.cssText, target.cssRules.length);
          }
        } catch (e) {
@@ -131,33 +86,12 @@ export async function printToPdf(
        }
      }

-      // Recursive function to find all canvases, including those in shadow roots
-      const findAllCanvases = (root: Node): HTMLCanvasElement[] => {
-        const canvases: HTMLCanvasElement[] = [];
-        const traverse = (node: Node) => {
-          if (node instanceof HTMLCanvasElement) {
-            canvases.push(node);
-          }
-          if (node instanceof HTMLElement || node instanceof ShadowRoot) {
-            node.childNodes.forEach(traverse);
-          }
-          if (node instanceof HTMLElement && node.shadowRoot) {
-            traverse(node.shadowRoot);
-          }
-        };
-        traverse(root);
-        return canvases;
-      };
-
      // convert all canvas to image
      const canvasImgObjectUrlMap = new Map<string, string>();
-      const allCanvas = findAllCanvases(rootElement);
+      const allCanvas = rootElement.getElementsByTagName('canvas');
      let canvasKey = 1;
-      const canvasToKeyMap = new Map<HTMLCanvasElement, string>();
-
      for (const canvas of allCanvas) {
-        const key = canvasKey.toString();
-        canvasToKeyMap.set(canvas, key);
+        canvas.dataset['printToPdfCanvasKey'] = canvasKey.toString();
        canvasKey++;
        const canvasImgObjectUrl = await new Promise<Blob | null>(resolve => {
          try {
@@ -172,42 +106,20 @@ export async function printToPdf(
          );
          continue;
        }
-        canvasImgObjectUrlMap.set(key, URL.createObjectURL(canvasImgObjectUrl));
+        canvasImgObjectUrlMap.set(
+          canvas.dataset['printToPdfCanvasKey'],
+          URL.createObjectURL(canvasImgObjectUrl)
+        );
      }

-      // Recursive deep clone that flattens Shadow DOM into Light DOM
-      const deepCloneWithShadows = (node: Node): Node => {
-        const clone = doc.importNode(node, false);
-
-        if (
-          clone instanceof HTMLCanvasElement &&
-          node instanceof HTMLCanvasElement
-        ) {
-          const key = canvasToKeyMap.get(node);
-          if (key) {
-            clone.dataset['printToPdfCanvasKey'] = key;
-          }
-        }
-
-        const appendChildren = (source: Node) => {
-          source.childNodes.forEach(child => {
-            (clone as Element).append(deepCloneWithShadows(child));
-          });
-        };
-
-        if (node instanceof HTMLElement && node.shadowRoot) {
-          appendChildren(node.shadowRoot);
-        }
-        appendChildren(node);
-
-        return clone;
-      };
-
-      const importedRoot = deepCloneWithShadows(rootElement) as HTMLDivElement;
+      const importedRoot = iframe.contentWindow.document.importNode(
+        rootElement,
+        true
+      ) as HTMLDivElement;

      // force light theme in print iframe
-      doc.documentElement.dataset.theme = 'light';
-      doc.body.dataset.theme = 'light';
+      iframe.contentWindow.document.documentElement.dataset.theme = 'light';
+      iframe.contentWindow.document.body.dataset.theme = 'light';
      importedRoot.dataset.theme = 'light';

      // draw saved canvas image to canvas
@@ -226,67 +138,17 @@ export async function printToPdf(
        }
      }

-      // Remove lazy loading from all images and force reload
-      const allImages = importedRoot.querySelectorAll('img');
-      allImages.forEach(img => {
-        img.removeAttribute('loading');
-        const src = img.getAttribute('src');
-        if (src) img.setAttribute('src', src);
-      });
-
-      // append to iframe
-      doc.body.append(importedRoot);
+      // append to iframe and print
+      iframe.contentWindow.document.body.append(importedRoot);

      await options.beforeprint?.(iframe);

-      // Robust image waiting logic
-      const waitForImages = async (container: HTMLElement) => {
-        const images: HTMLImageElement[] = [];
-        const view = container.ownerDocument.defaultView;
-        if (!view) return;
-
-        const findImages = (root: Node) => {
-          if (root instanceof view.HTMLImageElement) {
-            images.push(root);
-          }
-          if (
-            root instanceof view.HTMLElement ||
-            root instanceof view.ShadowRoot
-          ) {
-            root.childNodes.forEach(findImages);
-          }
-          if (root instanceof view.HTMLElement && root.shadowRoot) {
-            findImages(root.shadowRoot);
-          }
-        };
-
-        findImages(container);
-
-        await Promise.all(
-          images.map(img => {
-            if (img.complete) {
-              if (img.naturalWidth === 0) {
-                console.warn('Image failed to load:', img.src);
-              }
-              return Promise.resolve();
-            }
-            return new Promise(resolve => {
-              img.onload = resolve;
-              img.onerror = resolve;
-            });
-          })
-        );
-      };
-
-      await waitForImages(importedRoot);
-
-      // browser may take some time to load font or other resources
-      await (doc.fonts?.ready ??
-        new Promise<void>(resolve => {
-          setTimeout(() => {
-            resolve();
-          }, 1000);
-        }));
+      // browser may take some time to load font
+      await new Promise<void>(resolve => {
+        setTimeout(() => {
+          resolve();
+        }, 1000);
+      });

      iframe.contentWindow.onafterprint = async () => {
        iframe.remove();
--- a/blocksuite/integration-test/src/tests/edgeless/mindmap.spec.ts
+++ b/blocksuite/integration-test/src/tests/edgeless/mindmap.spec.ts
@@ -1,8 +1,9 @@
 import type { MindMapView } from '@blocksuite/affine/gfx/mindmap';
+import { mountShapeTextEditor } from '@blocksuite/affine/gfx/shape';
 import { LayoutType, type MindmapElementModel } from '@blocksuite/affine-model';
 import { Bound } from '@blocksuite/global/gfx';
 import type { GfxController } from '@blocksuite/std/gfx';
-import { beforeEach, describe, expect, test } from 'vitest';
+import { beforeEach, describe, expect, test, vi } from 'vitest';

 import { click, pointermove, wait } from '../utils/common.js';
 import { getDocRootBlock } from '../utils/edgeless.js';
@@ -36,6 +37,39 @@ describe('mindmap', () => {
    return cleanup;
  });

+  test('should update mindmap node editor size on compositionupdate', async () => {
+    const mindmapId = gfx.surface!.addElement({
+      type: 'mindmap',
+      children: {
+        text: 'root',
+      },
+    });
+    const mindmap = () => gfx.getElementById(mindmapId) as MindmapElementModel;
+
+    const root = getDocRootBlock(window.doc, window.editor, 'edgeless');
+    const rootNode = mindmap().tree.element;
+
+    mountShapeTextEditor(rootNode, root);
+    await wait();
+
+    const shapeEditor = root.querySelector('edgeless-shape-text-editor') as
+      | (HTMLElement & { inlineEditorContainer?: HTMLElement })
+      | null;
+
+    expect(shapeEditor).not.toBeNull();
+
+    const updateSpy = vi.spyOn(shapeEditor as any, '_updateElementWH');
+
+    const compositionUpdate = new CompositionEvent('compositionupdate', {
+      data: '拼',
+      bubbles: true,
+    });
+
+    shapeEditor!.inlineEditorContainer?.dispatchEvent(compositionUpdate);
+
+    expect(updateSpy).toHaveBeenCalled();
+  });
+
  test('delete the root node should remove all children', async () => {
    const tree = {
      text: 'root',
--- a/packages/backend/server/package.json
+++ b/packages/backend/server/package.json
@@ -25,7 +25,7 @@
  "dependencies": {
    "@affine/s3-compat": "workspace:*",
    "@affine/server-native": "workspace:*",
-    "@apollo/server": "^5.0.0",
+    "@apollo/server": "^4.13.0",
    "@fal-ai/serverless-client": "^0.15.0",
    "@google-cloud/opentelemetry-cloud-trace-exporter": "^3.0.0",
    "@google-cloud/opentelemetry-resource-util": "^3.0.0",
--- a/packages/frontend/apps/ios/App/App.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/packages/frontend/apps/ios/App/App.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -5,8 +5,8 @@
      "kind" : "remoteSourceControl",
      "location" : "https://github.com/apollographql/apollo-ios",
      "state" : {
-        "revision" : "3b1203b721a81f7995ee73f393aa07b43d301720",
-        "version" : "2.0.6"
+        "revision" : "d591c1dd55824867877cff4f6551fe32983d7f51",
+        "version" : "1.23.0"
      }
    },
    {
--- a/packages/frontend/apps/ios/App/Packages/AffineGraphQL/Package.swift
+++ b/packages/frontend/apps/ios/App/Packages/AffineGraphQL/Package.swift
@@ -14,7 +14,7 @@ let package = Package(
    .library(name: "AffineGraphQL", targets: ["AffineGraphQL"]),
  ],
  dependencies: [
-    .package(url: "https://github.com/apollographql/apollo-ios", exact: "2.0.6"),
+    .package(url: "https://github.com/apollographql/apollo-ios", exact: "1.23.0"),
  ],
  targets: [
    .target(
--- a/packages/frontend/apps/ios/App/Packages/Intelligents/Package.swift
+++ b/packages/frontend/apps/ios/App/Packages/Intelligents/Package.swift
@@ -16,7 +16,7 @@ let package = Package(
  dependencies: [
    .package(path: "../AffineGraphQL"),
    .package(path: "../AffineResources"),
-    .package(url: "https://github.com/apollographql/apollo-ios.git", from: "2.0.6"),
+    .package(url: "https://github.com/apollographql/apollo-ios.git", from: "1.23.0"),
    .package(url: "https://github.com/apple/swift-collections.git", from: "1.4.0"),
    .package(url: "https://github.com/SnapKit/SnapKit.git", from: "5.7.1"),
    .package(url: "https://github.com/SwifterSwift/SwifterSwift.git", from: "6.2.0"),
--- a/packages/frontend/core/src/modules/i18n/entities/i18n.ts
+++ b/packages/frontend/core/src/modules/i18n/entities/i18n.ts
@@ -54,22 +54,13 @@ export class I18n extends Entity {
  constructor(private readonly cache: GlobalCache) {
    super();
    this.i18n.on('languageChanged', (language: Language) => {
-      this.applyDocumentLanguage(language);
+      document.documentElement.lang = language;
      this.cache.set('i18n_lng', language);
    });
  }

  init() {
-    const language = this.currentLanguageKey$.value ?? 'en';
-    this.applyDocumentLanguage(language);
-    this.changeLanguage(language);
-  }
-
-  private applyDocumentLanguage(language: Language) {
-    document.documentElement.lang = language;
-    document.documentElement.dir = SUPPORTED_LANGUAGES[language]?.rtl
-      ? 'rtl'
-      : 'ltr';
+    this.changeLanguage(this.currentLanguageKey$.value ?? 'en');
  }

  changeLanguage = effect(
--- a/packages/frontend/i18n/src/resources/ar.json
+++ b/packages/frontend/i18n/src/resources/ar.json
--- a/packages/frontend/i18n/src/resources/index.ts
+++ b/packages/frontend/i18n/src/resources/index.ts
@@ -32,7 +32,6 @@ export const SUPPORTED_LANGUAGES: Record<
    name: string;
    originalName: string;
    flagEmoji: string;
-    rtl?: boolean;
    resource:
      | LanguageResource
      | (() => Promise<{ default: Partial<LanguageResource> }>);
@@ -150,21 +149,18 @@ export const SUPPORTED_LANGUAGES: Record<
    name: 'Urdu',
    originalName: 'اردو',
    flagEmoji: '🇵🇰',
-    rtl: true,
    resource: () => import('./ur.json'),
  },
  ar: {
    name: 'Arabic',
    originalName: 'العربية',
    flagEmoji: '🇸🇦',
-    rtl: true,
    resource: () => import('./ar.json'),
  },
  fa: {
    name: 'Persian',
    originalName: 'فارسی',
    flagEmoji: '🇮🇷',
-    rtl: true,
    resource: () => import('./fa.json'),
  },
  uk: {
--- a/tools/cli/src/rspack-shared/template.html
+++ b/tools/cli/src/rspack-shared/template.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="en" dir="ltr">
+<html lang="en">
  <head>
    <meta charset="utf-8" />
    <meta
--- a/yarn.lock
+++ b/yarn.lock
@@ -962,7 +962,7 @@ __metadata:
    "@affine/graphql": "workspace:*"
    "@affine/s3-compat": "workspace:*"
    "@affine/server-native": "workspace:*"
-    "@apollo/server": "npm:^5.0.0"
+    "@apollo/server": "npm:^4.13.0"
    "@faker-js/faker": "npm:^10.1.0"
    "@fal-ai/serverless-client": "npm:^0.15.0"
    "@google-cloud/opentelemetry-cloud-trace-exporter": "npm:^3.0.0"
@@ -1175,17 +1175,17 @@ __metadata:
  languageName: node
  linkType: hard

-"@apollo/server-gateway-interface@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@apollo/server-gateway-interface@npm:2.0.0"
+"@apollo/server-gateway-interface@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "@apollo/server-gateway-interface@npm:1.1.1"
  dependencies:
    "@apollo/usage-reporting-protobuf": "npm:^4.1.1"
-    "@apollo/utils.fetcher": "npm:^3.0.0"
-    "@apollo/utils.keyvaluecache": "npm:^4.0.0"
-    "@apollo/utils.logger": "npm:^3.0.0"
+    "@apollo/utils.fetcher": "npm:^2.0.0"
+    "@apollo/utils.keyvaluecache": "npm:^2.1.0"
+    "@apollo/utils.logger": "npm:^2.0.0"
  peerDependencies:
    graphql: 14.x || 15.x || 16.x
-  checksum: 10/2186a2926afdae07b2afbe927ff8eb7caf045f6906c5e0db8f84d38557588a39c21742f8fe06bb95d4a240f19e4ee5724135ef3b7980929b68888239875c6d83
+  checksum: 10/af0e95399297aa403c32ffff08c6dfa91a70aae73d5954f36e357f045cdb7e89f3bb4c3e70816d244f8f18af21d257bc79e934dd8bbaa1214c5f6d42a6a825d0
  languageName: node
  linkType: hard

@@ -1200,34 +1200,38 @@ __metadata:
  languageName: node
  linkType: hard

-"@apollo/server@npm:^5.0.0":
-  version: 5.4.0
-  resolution: "@apollo/server@npm:5.4.0"
+"@apollo/server@npm:^4.13.0":
+  version: 4.13.0
+  resolution: "@apollo/server@npm:4.13.0"
  dependencies:
    "@apollo/cache-control-types": "npm:^1.0.3"
-    "@apollo/server-gateway-interface": "npm:^2.0.0"
+    "@apollo/server-gateway-interface": "npm:^1.1.1"
    "@apollo/usage-reporting-protobuf": "npm:^4.1.1"
-    "@apollo/utils.createhash": "npm:^3.0.0"
-    "@apollo/utils.fetcher": "npm:^3.0.0"
-    "@apollo/utils.isnodelike": "npm:^3.0.0"
-    "@apollo/utils.keyvaluecache": "npm:^4.0.0"
-    "@apollo/utils.logger": "npm:^3.0.0"
+    "@apollo/utils.createhash": "npm:^2.0.2"
+    "@apollo/utils.fetcher": "npm:^2.0.0"
+    "@apollo/utils.isnodelike": "npm:^2.0.0"
+    "@apollo/utils.keyvaluecache": "npm:^2.1.0"
+    "@apollo/utils.logger": "npm:^2.0.0"
    "@apollo/utils.usagereporting": "npm:^2.1.0"
-    "@apollo/utils.withrequired": "npm:^3.0.0"
-    "@graphql-tools/schema": "npm:^10.0.0"
+    "@apollo/utils.withrequired": "npm:^2.0.0"
+    "@graphql-tools/schema": "npm:^9.0.0"
+    "@types/express": "npm:^4.17.13"
+    "@types/express-serve-static-core": "npm:^4.17.30"
+    "@types/node-fetch": "npm:^2.6.1"
    async-retry: "npm:^1.2.1"
-    body-parser: "npm:^2.2.2"
    content-type: "npm:^1.0.5"
    cors: "npm:^2.8.5"
-    finalhandler: "npm:^2.1.0"
+    express: "npm:^4.21.1"
    loglevel: "npm:^1.6.8"
-    lru-cache: "npm:^11.1.0"
-    negotiator: "npm:^1.0.0"
-    uuid: "npm:^11.1.0"
-    whatwg-mimetype: "npm:^4.0.0"
+    lru-cache: "npm:^7.10.1"
+    negotiator: "npm:^0.6.3"
+    node-abort-controller: "npm:^3.1.1"
+    node-fetch: "npm:^2.6.7"
+    uuid: "npm:^9.0.0"
+    whatwg-mimetype: "npm:^3.0.0"
  peerDependencies:
-    graphql: ^16.11.0
-  checksum: 10/6b12e962801960c809c9557594a8e331247e318f208096ffc66efac7846173698c8c6847dc4899912da23f943fd7854286e1ae11d8ac45b47b864d4d46117774
+    graphql: ^16.6.0
+  checksum: 10/7dbe6b7f2ff8dc3d397310c90fb0da281cec744346e9b7591066c2102c72f98b300df5b1c5b526eef8ed443a5d88123a19fdd53ec44c064598799cc73bc91469
  languageName: node
  linkType: hard

@@ -1240,13 +1244,13 @@ __metadata:
  languageName: node
  linkType: hard

-"@apollo/utils.createhash@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "@apollo/utils.createhash@npm:3.0.1"
+"@apollo/utils.createhash@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "@apollo/utils.createhash@npm:2.0.2"
  dependencies:
-    "@apollo/utils.isnodelike": "npm:^3.0.0"
+    "@apollo/utils.isnodelike": "npm:^2.0.1"
    sha.js: "npm:^2.4.11"
-  checksum: 10/3ceb2bf47c47635dc796d26ff82eb8b0d21dc6a003b35d1e165303f9e8d3422bb7c35a702b4d10fc62e8d86019e28d760ad2377978d7dc78879b71d79901398e
+  checksum: 10/54b299aedae46052374e008b714b4f60995a86f2e08514cc1c1105d5551d3207843e857177e6451ff9257578be552115d8c04f77200cc0aef9019405c42170ff
  languageName: node
  linkType: hard

@@ -1259,34 +1263,34 @@ __metadata:
  languageName: node
  linkType: hard

-"@apollo/utils.fetcher@npm:^3.0.0":
-  version: 3.1.0
-  resolution: "@apollo/utils.fetcher@npm:3.1.0"
-  checksum: 10/be536a773c2895e5cfc9212ebbb4719a693d0f501088ca14ff008468064f49a46f3ee4eb148bc4438fd408581c13317ce05bc3ad9068f2024f9cfaa4538a1de2
+"@apollo/utils.fetcher@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "@apollo/utils.fetcher@npm:2.0.1"
+  checksum: 10/e173d215c3544dade7b4a08733234d5180973c79e8e738e9e2530f2067e8731a5faa7f15176f4ca91f3cc95a4c70166a686c7382a6c6100f56ad5befcd613f9f
  languageName: node
  linkType: hard

-"@apollo/utils.isnodelike@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@apollo/utils.isnodelike@npm:3.0.0"
-  checksum: 10/c441fe25ae8a01167ad50806d7ba81f0f461ad28a413579d37867e76936bac03bf0938faee87afeeaf9e2b5dd5a6ae27595cfcc19aa213b990eef77e195103c5
+"@apollo/utils.isnodelike@npm:^2.0.0, @apollo/utils.isnodelike@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@apollo/utils.isnodelike@npm:2.0.1"
+  checksum: 10/c2e858186a60cccb7e4fc53e8b97b2a4d5470cd4975ad9cccd29e57a23eff1aa3a0c03edceb13c423632224ce2c327c6f1bb8bd77dc3fb039316bba5750536ec
  languageName: node
  linkType: hard

-"@apollo/utils.keyvaluecache@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "@apollo/utils.keyvaluecache@npm:4.0.0"
+"@apollo/utils.keyvaluecache@npm:^2.1.0":
+  version: 2.1.1
+  resolution: "@apollo/utils.keyvaluecache@npm:2.1.1"
  dependencies:
-    "@apollo/utils.logger": "npm:^3.0.0"
-    lru-cache: "npm:^11.0.0"
-  checksum: 10/e18d48d0de490bec0ae1d0849409dcd9415ef8b64de963df9955f21bb0852f058149a1862c585abd9d4d64c0b75f2d532b7c504695605177dfa74463b135498b
+    "@apollo/utils.logger": "npm:^2.0.1"
+    lru-cache: "npm:^7.14.1"
+  checksum: 10/9a6bc7c4645415329a93e77861cb1a9874b2171b741a3a667c277c6339f2ba46fb40011982e7b0993b118af1cc02e59e58fcbe7033ca6216cefec01e7b8eeda6
  languageName: node
  linkType: hard

-"@apollo/utils.logger@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@apollo/utils.logger@npm:3.0.0"
-  checksum: 10/e3bd3e55e7ff86410afa2620dd767073dcf017a8d1e5ab5484fe293a42d06c38e73b5dc5ada99dbb7b9ef2919f225214f7a7d3944a1665e72d84082837359c0b
+"@apollo/utils.logger@npm:^2.0.0, @apollo/utils.logger@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@apollo/utils.logger@npm:2.0.1"
+  checksum: 10/f975c81fcc7e54669b975031349f292930dc4cc3dd6bdc58bc7fe2159e0398a7d18b28860ee324c23722b005848e258094a143d20f6989fde5837379240b0066
  languageName: node
  linkType: hard

@@ -1344,10 +1348,10 @@ __metadata:
  languageName: node
  linkType: hard

-"@apollo/utils.withrequired@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@apollo/utils.withrequired@npm:3.0.0"
-  checksum: 10/63fb7e93a64d24b0f02ef8a14f53ed16288a9481bfde401b679614d00b18ecc894bac8e36e9bff53d6955a031d2a080d4056914530bf32592a131eb63a4c7ed0
+"@apollo/utils.withrequired@npm:^2.0.0":
+  version: 2.0.1
+  resolution: "@apollo/utils.withrequired@npm:2.0.1"
+  checksum: 10/ddd3a72d0f13e6283128d1aae787b65f8ef0bf2f2cf351e143c479f0838679e72d82f42f653b6baadd33a092854fc9cb9dd8af4a45938ee25b718274cef408ee
  languageName: node
  linkType: hard

@@ -6147,6 +6151,18 @@ __metadata:
  languageName: node
  linkType: hard

+"@graphql-tools/merge@npm:^8.4.1":
+  version: 8.4.2
+  resolution: "@graphql-tools/merge@npm:8.4.2"
+  dependencies:
+    "@graphql-tools/utils": "npm:^9.2.1"
+    tslib: "npm:^2.4.0"
+  peerDependencies:
+    graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+  checksum: 10/62a4e93812e11d083c17f7763f4333a29dbe99fddbff705ff5942a0bdbb9dcd14f668bd76bd3edda485534d5d1a7f09bac311b979196b6149df11d8968a83723
+  languageName: node
+  linkType: hard
+
 "@graphql-tools/optimize@npm:^2.0.0":
  version: 2.0.0
  resolution: "@graphql-tools/optimize@npm:2.0.0"
@@ -6210,6 +6226,20 @@ __metadata:
  languageName: node
  linkType: hard

+"@graphql-tools/schema@npm:^9.0.0":
+  version: 9.0.19
+  resolution: "@graphql-tools/schema@npm:9.0.19"
+  dependencies:
+    "@graphql-tools/merge": "npm:^8.4.1"
+    "@graphql-tools/utils": "npm:^9.2.1"
+    tslib: "npm:^2.4.0"
+    value-or-promise: "npm:^1.0.12"
+  peerDependencies:
+    graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+  checksum: 10/762811fe08ec67000b190305783677ea086e6b300a1882f46b804bdf790e32de986bef7bbd574ddd4114393ca9b97422cc604390652537d4595eba7dde825259
+  languageName: node
+  linkType: hard
+
 "@graphql-tools/url-loader@npm:^8.0.0, @graphql-tools/url-loader@npm:^8.0.15":
  version: 8.0.31
  resolution: "@graphql-tools/url-loader@npm:8.0.31"
@@ -6247,6 +6277,18 @@ __metadata:
  languageName: node
  linkType: hard

+"@graphql-tools/utils@npm:^9.2.1":
+  version: 9.2.1
+  resolution: "@graphql-tools/utils@npm:9.2.1"
+  dependencies:
+    "@graphql-typed-document-node/core": "npm:^3.1.1"
+    tslib: "npm:^2.4.0"
+  peerDependencies:
+    graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
+  checksum: 10/b1665043c2180a74d1e071f9f495ce16b2f46eeed1b319a290ae58f699629fe0a47b619c4f9be89135ff20b1c34fe6cc27e86570cf1e2cff07d3ae204f3d170d
+  languageName: node
+  linkType: hard
+
 "@graphql-tools/wrap@npm:^10.0.16":
  version: 10.0.35
  resolution: "@graphql-tools/wrap@npm:10.0.35"
@@ -16437,7 +16479,7 @@ __metadata:
  languageName: node
  linkType: hard

-"@types/express-serve-static-core@npm:^4.17.21, @types/express-serve-static-core@npm:^4.17.33":
+"@types/express-serve-static-core@npm:^4.17.21, @types/express-serve-static-core@npm:^4.17.30, @types/express-serve-static-core@npm:^4.17.33":
  version: 4.19.6
  resolution: "@types/express-serve-static-core@npm:4.19.6"
  dependencies:
@@ -16460,7 +16502,7 @@ __metadata:
  languageName: node
  linkType: hard

-"@types/express@npm:^4.17.25":
+"@types/express@npm:^4.17.13, @types/express@npm:^4.17.25":
  version: 4.17.25
  resolution: "@types/express@npm:4.17.25"
  dependencies:
@@ -16800,6 +16842,16 @@ __metadata:
  languageName: node
  linkType: hard

+"@types/node-fetch@npm:^2.6.1":
+  version: 2.6.12
+  resolution: "@types/node-fetch@npm:2.6.12"
+  dependencies:
+    "@types/node": "npm:*"
+    form-data: "npm:^4.0.0"
+  checksum: 10/8107c479da83a3114fcbfa882eba95ee5175cccb5e4dd53f737a96f2559ae6262f662176b8457c1656de09ec393cc7b20a266c077e4bfb21e929976e1cf4d0f9
+  languageName: node
+  linkType: hard
+
 "@types/node-forge@npm:^1.3.0":
  version: 1.3.11
  resolution: "@types/node-forge@npm:1.3.11"
@@ -18908,7 +18960,7 @@ __metadata:
  languageName: node
  linkType: hard

-"body-parser@npm:^2.2.1, body-parser@npm:^2.2.2":
+"body-parser@npm:^2.2.1":
  version: 2.2.2
  resolution: "body-parser@npm:2.2.2"
  dependencies:
@@ -23226,7 +23278,7 @@ __metadata:
  languageName: node
  linkType: hard

-"express@npm:^4.22.1":
+"express@npm:^4.21.1, express@npm:^4.22.1":
  version: 4.22.1
  resolution: "express@npm:4.22.1"
  dependencies:
@@ -27491,10 +27543,10 @@ __metadata:
  languageName: node
  linkType: hard

-"lru-cache@npm:^11.0.0, lru-cache@npm:^11.1.0":
-  version: 11.2.7
-  resolution: "lru-cache@npm:11.2.7"
-  checksum: 10/fbff4b8dee8189dde9b52cdfb3ea89b4c9cec094c1538cd30d1f47299477ff312efdb35f7994477ec72328f8e754e232b26a143feda1bd1f79ff22da6664d2c5
+"lru-cache@npm:^11.0.0":
+  version: 11.1.0
+  resolution: "lru-cache@npm:11.1.0"
+  checksum: 10/5011011675ca98428902de774d0963b68c3a193cd959347cb63b781dad4228924124afab82159fd7b8b4db18285d9aff462b877b8f6efd2b41604f806c1d9db4
  languageName: node
  linkType: hard

@@ -27516,7 +27568,7 @@ __metadata:
  languageName: node
  linkType: hard

-"lru-cache@npm:^7.7.1":
+"lru-cache@npm:^7.10.1, lru-cache@npm:^7.14.1, lru-cache@npm:^7.7.1":
  version: 7.18.3
  resolution: "lru-cache@npm:7.18.3"
  checksum: 10/6029ca5aba3aacb554e919d7ef804fffd4adfc4c83db00fac8248c7c78811fb6d4b6f70f7fd9d55032b3823446546a007edaa66ad1f2377ae833bd983fac5d98
@@ -35684,6 +35736,13 @@ __metadata:
  languageName: node
  linkType: hard

+"value-or-promise@npm:^1.0.12":
+  version: 1.0.12
+  resolution: "value-or-promise@npm:1.0.12"
+  checksum: 10/a4cc31fc9c3826b8a216ef2037b676904324c00c4acd903aaec2fe0c08516a189345261dd3cc822ec108532b2ea36b7c99bbdee1c3ddcb7f4b3d57d7e61b2064
+  languageName: node
+  linkType: hard
+
 "vary@npm:^1, vary@npm:^1.1.2, vary@npm:~1.1.2":
  version: 1.1.2
  resolution: "vary@npm:1.1.2"
Author	SHA1	Message	Date
DarkSky	b586fc0dea	Merge branch 'canary' into fix/issue-11515	2026-03-11 15:08:09 +08:00
catsjuice	4b57d9581a	fix(edgeless): accept persisted shape proxy when mounting text editor	2026-02-27 16:10:30 +08:00
catsjuice	b177024818	fix(edgeless): guard null shape element when mounting text editor	2026-02-27 10:55:42 +08:00
catsjuice	8ae9994443	test: cover mindmap IME composition resize hook	2026-02-26 15:26:18 +08:00
catsjuice	505505a1e7	fix: update mindmap node size during IME composition Fixes toeverything/AFFiNE#11515	2026-02-26 15:14:23 +08:00