@formicoidea/labre-core 0.38.2 → 0.39.3

package/dist/_pkgs/affine-block-database/properties/rich-text/cell-renderer.js

@@ -167,14 +167,17 @@ export class RichTextCell extends BaseCellRenderer {
             e.stopPropagation();
         };
         this._onPaste = (e) => {
-            e.preventDefault();
-            e.stopPropagation();
             const inlineEditor = this.inlineEditor$.value;
-            if (!inlineEditor)
-                return;
-            const inlineRange = inlineEditor.getInlineRange();
-            if (!inlineRange)
+            const inlineRange = inlineEditor?.getInlineRange();
+            // Bail out before cancelling the event: with no resolvable inline range
+            // there is nothing to insert into, and swallowing the paste here would
+            // drop the clipboard silently instead of letting the default path act.
+            if (!inlineEditor || !inlineRange)
                 return;
+            // The cell owns the paste: stop it before the document clipboard sees it,
+            // whichever branch below ends up handling the payload.
+            e.preventDefault();
+            e.stopPropagation();
             if (e.clipboardData) {
                 try {
                     const getDeltas = (snapshot) => {
@@ -290,9 +293,11 @@ export class RichTextCell extends BaseCellRenderer {
                 richText.addEventListener('cut', this._onCut, true);
                 richText.addEventListener('paste', this._onPaste, true);
                 return () => {
-                    richText.removeEventListener('copy', this._onCopy);
-                    richText.removeEventListener('cut', this._onCut);
-                    richText.removeEventListener('paste', this._onPaste);
+                    // the capture flag is part of the listener identity: without it
+                    // these three would never be removed.
+                    richText.removeEventListener('copy', this._onCopy, true);
+                    richText.removeEventListener('cut', this._onCut, true);
+                    richText.removeEventListener('paste', this._onPaste, true);
                 };
             }
             return;

package/dist/_pkgs/affine-block-frame/frame-manager.js

@@ -259,6 +259,15 @@ export class EdgelessFrameManager extends GfxExtension {
             }
         }));
         this._disposable.add(doc.slots.blockUpdated.subscribe(payload => {
+            // Local adds only, exactly like the canvas-element half above. A block
+            // added by a remote peer was already adopted THERE: the frame's
+            // `childElementIds` arrives with the same sync. Adopting it again here
+            // is a duplicate write on every receiving peer — and a readonly viewer
+            // cannot write at all, which is how this surfaced (#251). See #242 for
+            // the rule: a cascade reacts to local transactions, the receiving peer
+            // trusts the sync.
+            if (!payload.isLocal)
+                return;
             if (payload.type === 'add' &&
                 payload.model instanceof GfxBlockElementModel &&
                 renderableInEdgeless(doc, surfaceModel, payload.model)) {
@@ -275,15 +284,7 @@ export class EdgelessFrameManager extends GfxExtension {
                 if (this._enclosesFrame(payload.model, frame)) {
                     return;
                 }
-                if (payload.isLocal) {
-                    this._adoptNewlyCreatedElement(frame, payload.model);
-                }
-                else {
-                    // Remote adds: adopt only. The originating client reassigns the
-                    // index and syncs it — reindexing here too would produce
-                    // competing concurrent writes for the same element.
-                    this.addElementsToFrame(frame, [payload.model]);
-                }
+                this._adoptNewlyCreatedElement(frame, payload.model);
             }
         }));
     }

package/dist/_pkgs/affine-block-list/list-block.d.ts

@@ -6,6 +6,14 @@ import { type TemplateResult } from 'lit';
 export declare class ListBlockComponent extends CaptionedBlockComponent<ListBlockModel> {
     static styles: import("lit").CSSResult;
     private _inlineRangeProvider;
+    /**
+     * The collapse state a READER holds locally. Same contract as
+     * `affine-paragraph`: a readonly document is never written, so the toggle
+     * carries the reader's own expansion here instead of in the model. A signal
+     * rather than a Lit `@state()`, so BlockSuite effects can depend on it.
+     */
+    private readonly _readonlyCollapsed;
+    private _setReadonlyCollapsed;
     private readonly _onClickIcon;
     get attributeRenderer(): import("../std/inline/types.js").AttributeRenderer<import("../affine-shared/types/index.js").AffineTextAttributes>;
     get attributesSchema(): import("zod").ZodType<any, import("zod").ZodTypeDef, any>;
@@ -16,7 +24,6 @@ export declare class ListBlockComponent extends CaptionedBlockComponent<ListBloc
     connectedCallback(): void;
     getUpdateComplete(): Promise<boolean>;
     renderBlock(): TemplateResult<1>;
-    private accessor _readonlyCollapsed;
     private accessor _richTextElement;
     accessor blockContainerStyles: {
         margin: string;

package/dist/_pkgs/affine-block-list/list-block.js

@@ -42,9 +42,9 @@ import { DocModeProvider } from '../affine-shared/services/index.js';
 import { getViewportElement } from '../affine-shared/utils/index.js';
 import { BlockSelection, TextSelection } from '../std/index.js';
 import { getInlineRangeProvider, } from '../std/inline/index.js';
-import { effect } from '@preact/signals-core';
+import { effect, signal } from '@preact/signals-core';
 import { html, nothing } from 'lit';
-import { query, state } from 'lit/decorators.js';
+import { query } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
 import { styleMap } from 'lit/directives/style-map.js';
 import { correctNumberedListsOrderToPrev } from './commands/utils.js';
@@ -52,9 +52,6 @@ import { listBlockStyles } from './styles.js';
 import { getListIcon } from './utils/get-list-icon.js';
 let ListBlockComponent = (() => {
     let _classSuper = CaptionedBlockComponent;
-    let __readonlyCollapsed_decorators;
-    let __readonlyCollapsed_initializers = [];
-    let __readonlyCollapsed_extraInitializers = [];
     let __richTextElement_decorators;
     let __richTextElement_initializers = [];
     let __richTextElement_extraInitializers = [];
@@ -62,12 +59,19 @@ let ListBlockComponent = (() => {
         constructor() {
             super(...arguments);
             this._inlineRangeProvider = null;
+            /**
+             * The collapse state a READER holds locally. Same contract as
+             * `affine-paragraph`: a readonly document is never written, so the toggle
+             * carries the reader's own expansion here instead of in the model. A signal
+             * rather than a Lit `@state()`, so BlockSuite effects can depend on it.
+             */
+            this._readonlyCollapsed = signal(false);
             this._onClickIcon = (e) => {
                 e.stopPropagation();
                 e.preventDefault();
                 if (this.model.props.type === 'toggle') {
                     if (this.store.readonly) {
-                        this._readonlyCollapsed = !this._readonlyCollapsed;
+                        this._setReadonlyCollapsed(!this._readonlyCollapsed.value);
                     }
                     else {
                         this.store.captureSync();
@@ -93,21 +97,22 @@ let ListBlockComponent = (() => {
                 }
                 this._select();
             };
-            this.#_readonlyCollapsed_accessor_storage = __runInitializers(this, __readonlyCollapsed_initializers, false);
-            this.#_richTextElement_accessor_storage = (__runInitializers(this, __readonlyCollapsed_extraInitializers), __runInitializers(this, __richTextElement_initializers, null));
+            this.#_richTextElement_accessor_storage = __runInitializers(this, __richTextElement_initializers, null);
             this.#blockContainerStyles_accessor_storage = (__runInitializers(this, __richTextElement_extraInitializers), {
                 margin: 'var(--affine-list-margin, 10px 0)',
             });
         }
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
-            __readonlyCollapsed_decorators = [state()];
             __richTextElement_decorators = [query('rich-text')];
-            __esDecorate(this, null, __readonlyCollapsed_decorators, { kind: "accessor", name: "_readonlyCollapsed", static: false, private: false, access: { has: obj => "_readonlyCollapsed" in obj, get: obj => obj._readonlyCollapsed, set: (obj, value) => { obj._readonlyCollapsed = value; } }, metadata: _metadata }, __readonlyCollapsed_initializers, __readonlyCollapsed_extraInitializers);
             __esDecorate(this, null, __richTextElement_decorators, { kind: "accessor", name: "_richTextElement", static: false, private: false, access: { has: obj => "_richTextElement" in obj, get: obj => obj._richTextElement, set: (obj, value) => { obj._richTextElement = value; } }, metadata: _metadata }, __richTextElement_initializers, __richTextElement_extraInitializers);
             if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
         }
         static { this.styles = listBlockStyles; }
+        _setReadonlyCollapsed(collapsed) {
+            this._readonlyCollapsed.value = collapsed;
+            this.requestUpdate();
+        }
         get attributeRenderer() {
             return this.inlineManager.getRenderer();
         }
@@ -137,9 +142,14 @@ let ListBlockComponent = (() => {
         connectedCallback() {
             super.connectedCallback();
             this._inlineRangeProvider = getInlineRangeProvider(this);
+            // Only ENTERING readonly mode (or a later change of the persisted value)
+            // seeds the reader's local state; while readonly holds, the reader's own
+            // expansion is never overwritten. Aligned on `affine-paragraph`, where the
+            // unguarded version was a real defect (#262).
             this.disposables.add(effect(() => {
-                const collapsed = this.model.props.collapsed$.value;
-                this._readonlyCollapsed = collapsed;
+                if (this.store.readonly$.value) {
+                    this._setReadonlyCollapsed(this.model.props.collapsed$.value);
+                }
             }));
             this.disposables.add(effect(() => {
                 const type = this.model.props.type$.value;
@@ -162,10 +172,12 @@ let ListBlockComponent = (() => {
         renderBlock() {
             const { model, _onClickIcon } = this;
             const collapsed = this.store.readonly
-                ? this._readonlyCollapsed
+                ? this._readonlyCollapsed.value
                 : model.props.collapsed;
             const listIcon = getListIcon(model, !collapsed, _onClickIcon);
+            const childrenId = `list-children-${this.model.id}`;
             const children = html `<div
+      id=${childrenId}
       class="affine-block-children-container"
       style=${styleMap({
                 paddingLeft: `${BLOCK_CHILDREN_CONTAINER_PADDING_LEFT}px`,
@@ -187,9 +199,10 @@ let ListBlockComponent = (() => {
                 ? html `
                 <blocksuite-toggle-button
                   .collapsed=${collapsed}
+                  .controls=${childrenId}
                   .updateCollapsed=${(value) => {
                     if (this.store.readonly) {
-                        this._readonlyCollapsed = value;
+                        this._setReadonlyCollapsed(value);
                     }
                     else {
                         this.store.captureSync();
@@ -222,9 +235,6 @@ let ListBlockComponent = (() => {
       </div>
     `;
         }
-        #_readonlyCollapsed_accessor_storage;
-        get _readonlyCollapsed() { return this.#_readonlyCollapsed_accessor_storage; }
-        set _readonlyCollapsed(value) { this.#_readonlyCollapsed_accessor_storage = value; }
         #_richTextElement_accessor_storage;
         get _richTextElement() { return this.#_richTextElement_accessor_storage; }
         set _richTextElement(value) { this.#_richTextElement_accessor_storage = value; }

package/dist/_pkgs/affine-block-paragraph/paragraph-block.d.ts

@@ -7,9 +7,17 @@ export declare class ParagraphBlockComponent extends CaptionedBlockComponent<Par
     focused$: import("@preact/signals-core").ReadonlySignal<boolean>;
     private readonly _composing;
     private readonly _displayPlaceholder;
+    /**
+     * The collapse state a READER holds locally. A readonly document must never
+     * be written, so the chevron cannot touch `model.props.collapsed`; this
+     * signal carries the reader's own expansion instead. It is a signal rather
+     * than a Lit `@state()` so BlockSuite effects can depend on it as well.
+     */
+    private readonly _readonlyCollapsed;
     private _inlineRangeProvider;
     private readonly _isInDatabase;
     private get _placeholder();
+    private _setReadonlyCollapsed;
     get citationService(): import("../affine-shared/services/index.js").CitationViewService;
     get attributeRenderer(): import("../std/inline/types.js").AttributeRenderer<import("../affine-shared/types/index.js").AffineTextAttributes>;
     get attributesSchema(): import("zod").ZodType<any, import("zod").ZodTypeDef, any>;
@@ -24,7 +32,6 @@ export declare class ParagraphBlockComponent extends CaptionedBlockComponent<Par
     connectedCallback(): void;
     getUpdateComplete(): Promise<boolean>;
     renderBlock(): TemplateResult<1>;
-    private accessor _readonlyCollapsed;
     private accessor _richTextElement;
     accessor blockContainerStyles: {
         margin: string;

package/dist/_pkgs/affine-block-paragraph/paragraph-block.js

@@ -42,7 +42,7 @@ import { TextSelection } from '../std/index.js';
 import { getInlineRangeProvider, } from '../std/inline/index.js';
 import { computed, effect, signal } from '@preact/signals-core';
 import { html, nothing } from 'lit';
-import { query, state } from 'lit/decorators.js';
+import { query } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
 import { styleMap } from 'lit/directives/style-map.js';
 import { unsafeHTML } from 'lit/directives/unsafe-html.js';
@@ -50,9 +50,6 @@ import { ParagraphBlockConfigExtension } from './paragraph-block-config.js';
 import { paragraphBlockStyles } from './styles.js';
 let ParagraphBlockComponent = (() => {
     let _classSuper = CaptionedBlockComponent;
-    let __readonlyCollapsed_decorators;
-    let __readonlyCollapsed_initializers = [];
-    let __readonlyCollapsed_extraInitializers = [];
     let __richTextElement_decorators;
     let __richTextElement_initializers = [];
     let __richTextElement_extraInitializers = [];
@@ -67,6 +64,13 @@ let ParagraphBlockComponent = (() => {
             });
             this._composing = signal(false);
             this._displayPlaceholder = signal(false);
+            /**
+             * The collapse state a READER holds locally. A readonly document must never
+             * be written, so the chevron cannot touch `model.props.collapsed`; this
+             * signal carries the reader's own expansion instead. It is a signal rather
+             * than a Lit `@state()` so BlockSuite effects can depend on it as well.
+             */
+            this._readonlyCollapsed = signal(false);
             this._inlineRangeProvider = null;
             this._isInDatabase = () => {
                 let parent = this.parentElement;
@@ -78,17 +82,14 @@ let ParagraphBlockComponent = (() => {
                 }
                 return false;
             };
-            this.#_readonlyCollapsed_accessor_storage = __runInitializers(this, __readonlyCollapsed_initializers, false);
-            this.#_richTextElement_accessor_storage = (__runInitializers(this, __readonlyCollapsed_extraInitializers), __runInitializers(this, __richTextElement_initializers, null));
+            this.#_richTextElement_accessor_storage = __runInitializers(this, __richTextElement_initializers, null);
             this.#blockContainerStyles_accessor_storage = (__runInitializers(this, __richTextElement_extraInitializers), {
                 margin: 'var(--affine-paragraph-margin, 10px 0)',
             });
         }
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
-            __readonlyCollapsed_decorators = [state()];
             __richTextElement_decorators = [query('rich-text')];
-            __esDecorate(this, null, __readonlyCollapsed_decorators, { kind: "accessor", name: "_readonlyCollapsed", static: false, private: false, access: { has: obj => "_readonlyCollapsed" in obj, get: obj => obj._readonlyCollapsed, set: (obj, value) => { obj._readonlyCollapsed = value; } }, metadata: _metadata }, __readonlyCollapsed_initializers, __readonlyCollapsed_extraInitializers);
             __esDecorate(this, null, __richTextElement_decorators, { kind: "accessor", name: "_richTextElement", static: false, private: false, access: { has: obj => "_richTextElement" in obj, get: obj => obj._richTextElement, set: (obj, value) => { obj._richTextElement = value; } }, metadata: _metadata }, __richTextElement_initializers, __richTextElement_extraInitializers);
             if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
         }
@@ -98,6 +99,10 @@ let ParagraphBlockComponent = (() => {
                 .get(ParagraphBlockConfigExtension.identifier)
                 ?.getPlaceholder(this.model);
         }
+        _setReadonlyCollapsed(collapsed) {
+            this._readonlyCollapsed.value = collapsed;
+            this.requestUpdate();
+        }
         get citationService() {
             return this.std.get(CitationProvider);
         }
@@ -176,9 +181,19 @@ let ParagraphBlockComponent = (() => {
                     this.model.props.collapsed = false;
                 }
             }));
+            // Entering readonly mode (and any later change of the persisted value)
+            // seeds the reader's local state. Deliberately NOT re-run on every
+            // selection change: this effect must not depend on the selection, or the
+            // reader's own expansion would be overwritten mid-drag.
+            this.disposables.add(effect(() => {
+                if (this.store.readonly$.value) {
+                    this._setReadonlyCollapsed(this.model.props.collapsed$.value);
+                }
+            }));
             this.disposables.add(effect(() => {
-                const collapsed = this.model.props.collapsed$.value;
-                this._readonlyCollapsed = collapsed;
+                const collapsed = this.store.readonly
+                    ? this._readonlyCollapsed.value
+                    : this.model.props.collapsed$.value;
                 // reset text selection when selected block is collapsed
                 if (this.model.props.type$.value.startsWith('h') && collapsed) {
                     const collapsedSiblings = this.collapsedSiblings;
@@ -216,7 +231,7 @@ let ParagraphBlockComponent = (() => {
         renderBlock() {
             const { type$ } = this.model.props;
             const collapsed = this.store.readonly
-                ? this._readonlyCollapsed
+                ? this._readonlyCollapsed.value
                 : this.model.props.collapsed;
             const collapsedSiblings = this.collapsedSiblings;
             let style = html ``;
@@ -231,7 +246,9 @@ let ParagraphBlockComponent = (() => {
         </style>
       `;
             }
+            const childrenId = `heading-children-${this.model.id}`;
             const children = html `<div
+      id=${childrenId}
       class="affine-block-children-container"
       style=${styleMap({
                 paddingLeft: `${BLOCK_CHILDREN_CONTAINER_PADDING_LEFT}px`,
@@ -275,9 +292,10 @@ let ParagraphBlockComponent = (() => {
                 ? html `
                 <blocksuite-toggle-button
                   .collapsed=${collapsed}
+                  .controls=${childrenId}
                   .updateCollapsed=${(value) => {
                     if (this.store.readonly) {
-                        this._readonlyCollapsed = value;
+                        this._setReadonlyCollapsed(value);
                     }
                     else {
                         this.store.captureSync();
@@ -328,9 +346,6 @@ let ParagraphBlockComponent = (() => {
       </div>
     `;
         }
-        #_readonlyCollapsed_accessor_storage;
-        get _readonlyCollapsed() { return this.#_readonlyCollapsed_accessor_storage; }
-        set _readonlyCollapsed(value) { this.#_readonlyCollapsed_accessor_storage = value; }
         #_richTextElement_accessor_storage;
         get _richTextElement() { return this.#_richTextElement_accessor_storage; }
         set _richTextElement(value) { this.#_richTextElement_accessor_storage = value; }

package/dist/_pkgs/affine-block-root/edgeless/clipboard/clipboard.js

@@ -4,7 +4,7 @@ import { addImages } from '../../../affine-block-image/index.js';
 import { CanvasRenderer, DefaultTool, EdgelessCRUDIdentifier, ExportManager, getSurfaceComponent, } from '../../../affine-block-surface/index.js';
 import { splitIntoLines } from '../../../affine-gfx-text/index.js';
 import { BookmarkStyles, DEFAULT_NOTE_HEIGHT, DEFAULT_NOTE_WIDTH, FrameBlockModel, MAX_IMAGE_WIDTH, } from '../../../affine-model/index.js';
-import { ClipboardAdapter, decodeClipboardBlobs, } from '../../../affine-shared/adapters/index.js';
+import { ClipboardAdapter, decodeClipboardBlobs, ImageProxyService, } from '../../../affine-shared/adapters/index.js';
 import { CANVAS_EXPORT_IGNORE_TAGS, EMBED_CARD_HEIGHT, EMBED_CARD_WIDTH, } from '../../../affine-shared/consts/index.js';
 import { EmbedOptionProvider, ParseDocUrlProvider, TelemetryProvider, } from '../../../affine-shared/services/index.js';
 import { convertToPng, isInsidePageEditor, isTopLevelBlock, isUrlInClipboard, matchModels, referenceToNode, } from '../../../affine-shared/utils/index.js';
@@ -324,7 +324,7 @@ export class EdgelessClipboardController extends PageClipboard {
         }
         ctx.scale(dpr, dpr);
         const replaceImgSrcWithSvg = this._exportManager?.replaceImgSrcWithSvg;
-        const imageProxy = host.std.clipboard.configs.get('imageProxy');
+        const imageProxy = host.std.get(ImageProxyService).imageProxyURL;
         const html2canvasOption = {
             ignoreElements: function (element) {
                 if (CANVAS_EXPORT_IGNORE_TAGS.includes(element.tagName) ||
@@ -351,7 +351,7 @@ export class EdgelessClipboardController extends PageClipboard {
                 await replaceImgSrcWithSvg?.(element);
             },
             backgroundColor: 'transparent',
-            useCORS: imageProxy ? false : true,
+            useCORS: !imageProxy,
             proxy: imageProxy,
         };
         const _drawTopLevelBlock = async (block, isInFrame = false) => {

package/dist/_pkgs/affine-block-root/keyboard/keymap.js

@@ -1,13 +1,33 @@
 import { KeymapExtension } from '../../std/index.js';
+const NATIVE_FOCUSABLE_SELECTOR = 'button, a[href], input, select, textarea, [tabindex]:not([tabindex="-1"])';
+/**
+ * The editor host swallows Tab and Shift-Tab so that indentation stays under
+ * the control of the block-scoped handlers. That would however trap the focus
+ * on the native controls the editor renders (the collapse button of headings
+ * and lists, for instance), which then could neither be reached nor left with
+ * the keyboard. When the event originates from such a control — and not from
+ * editable text — the native tabbing behaviour is let through.
+ */
+const isNativeFocusableTarget = (target) => {
+    if (!(target instanceof Element))
+        return false;
+    if (target instanceof HTMLElement && target.isContentEditable)
+        return false;
+    return !!target.closest(NATIVE_FOCUSABLE_SELECTOR);
+};
 export const fallbackKeymap = KeymapExtension(() => {
     return {
         Tab: ctx => {
             const event = ctx.get('defaultState').event;
+            if (isNativeFocusableTarget(event.target))
+                return;
             event.stopPropagation();
             event.preventDefault();
         },
         'Shift-Tab': ctx => {
             const event = ctx.get('defaultState').event;
+            if (isNativeFocusableTarget(event.target))
+                return;
             event.stopPropagation();
             event.preventDefault();
         },

package/dist/_pkgs/affine-block-surface/extensions/export-manager/export-manager.d.ts

@@ -3,12 +3,14 @@ import { type BlockStdScope, type EditorHost } from '../../../std/index.js';
 import { GfxBlockElementModel, type GfxController, GfxPrimitiveElementModel } from '../../../std/gfx/index.js';
 import type { ExtensionType, Store } from '../../../store/index.js';
 import { CanvasRenderer } from '../../renderer/canvas-renderer.js';
-export type ExportOptions = {
-    imageProxyEndpoint: string;
-};
 export declare class ExportManager {
     readonly std: BlockStdScope;
-    private readonly _exportOptions;
+    /**
+     * The image proxy every remote-image fetch of the export goes through —
+     * resolved from {@link ImageProxyService}, the one host seam for it, never
+     * from a local constant. Empty means « fetch direct » (issue #258).
+     */
+    private get _imageProxyURL();
     replaceImgSrcWithSvg: (element: HTMLElement) => Promise<void>;
     get doc(): Store;
     get editorHost(): EditorHost;

package/dist/_pkgs/affine-block-surface/extensions/export-manager/export-manager.js

@@ -1,6 +1,6 @@
 import { ImageBlockModel } from '../../../affine-model/index.js';
-import { FetchUtils } from '../../../affine-shared/adapters/index.js';
-import { CANVAS_EXPORT_IGNORE_TAGS, DEFAULT_IMAGE_PROXY_ENDPOINT, } from '../../../affine-shared/consts/index.js';
+import { FetchUtils, ImageProxyService } from '../../../affine-shared/adapters/index.js';
+import { CANVAS_EXPORT_IGNORE_TAGS } from '../../../affine-shared/consts/index.js';
 import { isInsidePageEditor, matchModels } from '../../../affine-shared/utils/index.js';
 import { BlockSuiteError, ErrorCode } from '../../../global/exceptions/index.js';
 import { deserializeXYWH } from '../../../global/gfx/index.js';
@@ -10,6 +10,14 @@ import { CanvasRenderer } from '../../renderer/canvas-renderer.js';
 import { getBgGridGap } from '../../utils/get-bg-grip-gap.js';
 import { FileExporter } from './file-exporter.js';
 export class ExportManager {
+    /**
+     * The image proxy every remote-image fetch of the export goes through —
+     * resolved from {@link ImageProxyService}, the one host seam for it, never
+     * from a local constant. Empty means « fetch direct » (issue #258).
+     */
+    get _imageProxyURL() {
+        return this.std.get(ImageProxyService).imageProxyURL;
+    }
     get doc() {
         return this.std.store;
     }
@@ -18,14 +26,11 @@ export class ExportManager {
     }
     constructor(std) {
         this.std = std;
-        this._exportOptions = {
-            imageProxyEndpoint: DEFAULT_IMAGE_PROXY_ENDPOINT,
-        };
         this.replaceImgSrcWithSvg = async (element) => {
             const imgList = Array.from(element.querySelectorAll('img'));
             // Create an array of promises
             const promises = imgList.map(img => {
-                return FetchUtils.fetchImage(img.src, undefined, this._exportOptions.imageProxyEndpoint)
+                return FetchUtils.fetchImage(img.src, undefined, this._imageProxyURL)
                     .then(response => response && response.blob())
                     .then(async (blob) => {
                     if (!blob)
@@ -159,8 +164,8 @@ export class ExportManager {
             x: pageLeft - viewport.left,
             width: pageWidth,
             height: viewportHeight,
-            useCORS: this._exportOptions.imageProxyEndpoint ? false : true,
-            proxy: this._exportOptions.imageProxyEndpoint,
+            useCORS: !this._imageProxyURL,
+            proxy: this._imageProxyURL,
         };
         let data;
         try {
@@ -228,8 +233,8 @@ export class ExportManager {
                 });
                 await this.replaceImgSrcWithSvg(element);
             },
-            useCORS: this._exportOptions.imageProxyEndpoint ? false : true,
-            proxy: this._exportOptions.imageProxyEndpoint,
+            useCORS: !this._imageProxyURL,
+            proxy: this._imageProxyURL,
         };
         let data;
         try {

package/dist/_pkgs/affine-block-surface/utils/priority-queue.js

@@ -21,9 +21,9 @@ export class PriorityQueue {
             if (rightChildIndex < length) {
                 leftChild = this.heap[leftChildIndex];
                 rightChild = this.heap[rightChildIndex];
-                if ((swap === null &&
+                if ((swap === -1 &&
                     this._compare(rightChild.priority, element.priority) < 0) ||
-                    (swap !== null &&
+                    (swap !== -1 &&
                         this._compare(rightChild.priority, leftChild.priority) < 0)) {
                     swap = rightChildIndex;
                 }

package/dist/_pkgs/affine-components/toggle-button/toggle-button.d.ts

@@ -6,6 +6,11 @@ export declare class ToggleButton extends ToggleButton_base {
     render(): import("lit-html").TemplateResult<1>;
     accessor collapsed: boolean;
     accessor updateCollapsed: (collapsed: boolean) => void;
+    /**
+     * Id of the children container this button expands and collapses,
+     * exposed to assistive technologies through `aria-controls`.
+     */
+    accessor controls: string;
 }
 declare global {
     interface HTMLElementTagNameMap {

package/dist/_pkgs/affine-components/toggle-button/toggle-button.js

@@ -48,13 +48,18 @@ let ToggleButton = (() => {
     let _updateCollapsed_decorators;
     let _updateCollapsed_initializers = [];
     let _updateCollapsed_extraInitializers = [];
+    let _controls_decorators;
+    let _controls_initializers = [];
+    let _controls_extraInitializers = [];
     return class ToggleButton extends _classSuper {
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
             _collapsed_decorators = [property({ attribute: false })];
             _updateCollapsed_decorators = [property({ attribute: false })];
+            _controls_decorators = [property({ attribute: false })];
             __esDecorate(this, null, _collapsed_decorators, { kind: "accessor", name: "collapsed", static: false, private: false, access: { has: obj => "collapsed" in obj, get: obj => obj.collapsed, set: (obj, value) => { obj.collapsed = value; } }, metadata: _metadata }, _collapsed_initializers, _collapsed_extraInitializers);
             __esDecorate(this, null, _updateCollapsed_decorators, { kind: "accessor", name: "updateCollapsed", static: false, private: false, access: { has: obj => "updateCollapsed" in obj, get: obj => obj.updateCollapsed, set: (obj, value) => { obj.updateCollapsed = value; } }, metadata: _metadata }, _updateCollapsed_initializers, _updateCollapsed_extraInitializers);
+            __esDecorate(this, null, _controls_decorators, { kind: "accessor", name: "controls", static: false, private: false, access: { has: obj => "controls" in obj, get: obj => obj.controls, set: (obj, value) => { obj.controls = value; } }, metadata: _metadata }, _controls_initializers, _controls_extraInitializers);
             if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
         }
         static { this.styles = css `
@@ -63,6 +68,11 @@ let ToggleButton = (() => {
       align-items: start;
       justify-content: start;
       position: absolute;
+      padding: 0;
+      border: 0;
+      color: inherit;
+      background: transparent;
+      font: inherit;
       width: 16px;
       height: 16px;
       top: calc((1em - 16px) / 2 + 5px);
@@ -78,6 +88,11 @@ let ToggleButton = (() => {
       background: var(--affine-hover-color);
     }
 
+    .toggle-icon:focus-visible {
+      opacity: 1;
+      outline: 1px solid var(--affine-primary-color);
+    }
+
     .toggle-icon[data-collapsed='true'] {
       opacity: 1;
     }
@@ -100,32 +115,23 @@ let ToggleButton = (() => {
     }
   `; }
         render() {
-            const toggleDownTemplate = html `
-      <div
-        contenteditable="false"
-        class="toggle-icon"
-        @click=${() => this.updateCollapsed(!this.collapsed)}
-      >
-        ${ToggleDownIcon({
-                width: '16px',
-                height: '16px',
-            })}
-      </div>
-    `;
-            const toggleRightTemplate = html `
-      <div
+            return html `
+      <button
+        type="button"
         contenteditable="false"
         class="toggle-icon"
         data-collapsed=${this.collapsed}
+        aria-label=${this.collapsed ? 'Expand content' : 'Collapse content'}
+        aria-expanded=${!this.collapsed}
+        aria-controls=${this.controls}
         @click=${() => this.updateCollapsed(!this.collapsed)}
       >
-        ${ToggleRightIcon({
+        ${(this.collapsed ? ToggleRightIcon : ToggleDownIcon)({
                 width: '16px',
                 height: '16px',
             })}
-      </div>
+      </button>
     `;
-            return this.collapsed ? toggleRightTemplate : toggleDownTemplate;
         }
         #collapsed_accessor_storage = __runInitializers(this, _collapsed_initializers, void 0);
         get collapsed() { return this.#collapsed_accessor_storage; }
@@ -133,9 +139,16 @@ let ToggleButton = (() => {
         #updateCollapsed_accessor_storage = (__runInitializers(this, _collapsed_extraInitializers), __runInitializers(this, _updateCollapsed_initializers, void 0));
         get updateCollapsed() { return this.#updateCollapsed_accessor_storage; }
         set updateCollapsed(value) { this.#updateCollapsed_accessor_storage = value; }
+        #controls_accessor_storage = (__runInitializers(this, _updateCollapsed_extraInitializers), __runInitializers(this, _controls_initializers, void 0));
+        /**
+         * Id of the children container this button expands and collapses,
+         * exposed to assistive technologies through `aria-controls`.
+         */
+        get controls() { return this.#controls_accessor_storage; }
+        set controls(value) { this.#controls_accessor_storage = value; }
         constructor() {
             super(...arguments);
-            __runInitializers(this, _updateCollapsed_extraInitializers);
+            __runInitializers(this, _controls_extraInitializers);
         }
     };
 })();