@formicoidea/labre-core 0.28.0 → 0.29.1

package/dist/_pkgs/affine-block-embed-doc/embed-linked-doc-block/embed-linked-doc-block.js

@@ -38,7 +38,7 @@ import { LoadingIcon } from '../../affine-components/icons/index.js';
 import { isPeekable, Peekable } from '../../affine-components/peek/index.js';
 import { RefNodeSlotsProvider } from '../../affine-inline-reference/index.js';
 import { EMBED_CARD_HEIGHT, EMBED_CARD_WIDTH, REFERENCE_NODE, } from '../../affine-shared/consts/index.js';
-import { CitationProvider, DocDisplayMetaProvider, DocModeProvider, OpenDocExtensionIdentifier, ThemeProvider, } from '../../affine-shared/services/index.js';
+import { CitationProvider, DocDisplayMetaProvider, DocModeProvider, OpenDocExtensionIdentifier, ThemeProvider, whenLinkedDocContentReady, } from '../../affine-shared/services/index.js';
 import { cloneReferenceInfo, cloneReferenceInfoWithoutAliases, isNewTabTrigger, isNewViewTrigger, matchModels, referenceToNode, } from '../../affine-shared/utils/index.js';
 import { Bound } from '../../global/gfx/index.js';
 import { ResetIcon } from '@blocksuite/icons/lit';
@@ -286,12 +286,11 @@ let EmbedLinkedDocBlockComponent = (() => {
                     }
                 }
                 if (!this.isError && !linkedDoc.root) {
-                    await new Promise(resolve => {
-                        const subscription = linkedDoc.slots.rootAdded.subscribe(() => {
-                            subscription.unsubscribe();
-                            resolve();
-                        });
-                    });
+                    // Bounded wait: if the host hasn't preloaded the referenced doc, ask the
+                    // optional content resolver to hydrate it and wait at most `timeoutMs`.
+                    // On timeout we stop loading and fall through to a degraded card (title
+                    // only) instead of spinning forever.
+                    await whenLinkedDocContentReady(this.std, linkedDoc, this.model.props.pageId);
                 }
                 this._loading = false;
                 // If it is a link to a block or element, the content will not be rendered.

package/dist/_pkgs/affine-block-embed-doc/embed-synced-doc-block/components/embed-synced-doc-card.js

@@ -34,7 +34,7 @@ var __runInitializers = (this && this.__runInitializers) || function (thisArg, i
 };
 import { RENDER_CARD_THROTTLE_MS } from '../../../affine-block-embed/index.js';
 import { LoadingIcon } from '../../../affine-components/icons/index.js';
-import { ThemeProvider } from '../../../affine-shared/services/index.js';
+import { ThemeProvider, whenLinkedDocContentReady, } from '../../../affine-shared/services/index.js';
 import { WithDisposable } from '../../../global/lit/index.js';
 import { ResetIcon } from '@blocksuite/icons/lit';
 import { BlockSelection, isGfxBlockComponent, ShadowlessElement, } from '../../../std/index.js';
@@ -139,10 +139,10 @@ let EmbedSyncedDocCard = (() => {
                     renderLinkedDocInCard(this);
                 }
                 else {
-                    const subscription = syncedDoc.slots.rootAdded.subscribe(() => {
-                        subscription.unsubscribe();
-                        renderLinkedDocInCard(this);
-                    });
+                    // Bounded: ask the host to hydrate the doc, wait at most timeoutMs, then
+                    // render regardless (degraded if still empty) rather than waiting for a
+                    // `rootAdded` that may never fire when the doc isn't preloaded.
+                    void whenLinkedDocContentReady(this.std, syncedDoc, this.model.props.pageId).then(() => renderLinkedDocInCard(this));
                 }
                 this.disposables.add(syncedDoc.workspace.slots.docListUpdated.subscribe(() => {
                     renderLinkedDocInCard(this);

package/dist/_pkgs/affine-block-root/configs/toolbar.d.ts

@@ -39,12 +39,12 @@ export declare const builtinToolbarConfig: {
         readonly label?: string;
         readonly icon?: import("lit-html").TemplateResult;
         readonly active?: ((cx: import("../../affine-shared/services/index.js").ToolbarContext) => boolean) | boolean;
+        readonly disabled?: ((cx: import("../../affine-shared/services/index.js").ToolbarContext) => boolean) | boolean;
         readonly placement?: ActionPlacement;
         readonly tooltip?: string | import("lit-html").TemplateResult;
         readonly score?: number;
         readonly when?: ((cx: import("../../affine-shared/services/index.js").ToolbarContext) => boolean) | boolean;
         readonly showLabel?: boolean;
-        readonly disabled?: ((cx: import("../../affine-shared/services/index.js").ToolbarContext) => boolean) | boolean;
         readonly run?: (cx: import("../../affine-shared/services/index.js").ToolbarContext) => void;
         readonly id: "g.comment";
     }, {

package/dist/_pkgs/affine-block-root/index.d.ts

@@ -2,6 +2,7 @@ export * from './adapters';
 export * from './clipboard/index.js';
 export * from './edgeless/edgeless-root-spec.js';
 export * from './edgeless/index.js';
+export * from './keyboard/shortcuts.js';
 export * from './page/page-root-block.js';
 export * from './preview/preview-root-block.js';
 export * from './types.js';

package/dist/_pkgs/affine-block-root/index.js

@@ -2,6 +2,7 @@ export * from './adapters';
 export * from './clipboard/index.js';
 export * from './edgeless/edgeless-root-spec.js';
 export * from './edgeless/index.js';
+export * from './keyboard/shortcuts.js';
 export * from './page/page-root-block.js';
 export * from './preview/preview-root-block.js';
 export * from './types.js';

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

@@ -3,7 +3,7 @@ import { ParagraphBlockComponent } from '../../affine-block-paragraph/index.js';
 import { NoteBlockModel, ParagraphBlockModel } from '../../affine-model/index.js';
 import { draftSelectedModelsCommand, getSelectedModelsCommand, } from '../../affine-shared/commands/index.js';
 import { matchModels } from '../../affine-shared/utils/index.js';
-import { IS_MAC, IS_WINDOWS } from '../../global/env/index.js';
+import { IS_MAC } from '../../global/env/index.js';
 import { BlockSelection, } from '../../std/index.js';
 import { toDraftModel } from '../../store/index.js';
 export class PageKeyboardManager {
@@ -55,27 +55,9 @@ export class PageKeyboardManager {
                 this._selection.clear(['block', 'text']);
             });
         };
+        // undo / redo are now rebindable shortcut descriptors (see
+        // `keyboard/shortcuts.ts`), installed via `ShortcutKeymapExtension`.
         this.rootComponent.bindHotKey({
-            'Mod-z': ctx => {
-                ctx.get('defaultState').event.preventDefault();
-                if (this._doc.canUndo) {
-                    this._doc.undo();
-                }
-            },
-            'Shift-Mod-z': ctx => {
-                ctx.get('defaultState').event.preventDefault();
-                if (this._doc.canRedo) {
-                    this._doc.redo();
-                }
-            },
-            'Control-y': ctx => {
-                if (!IS_WINDOWS)
-                    return;
-                ctx.get('defaultState').event.preventDefault();
-                if (this._doc.canRedo) {
-                    this._doc.redo();
-                }
-            },
             'Mod-Backspace': () => true,
             Backspace: this._handleDelete,
             Delete: this._handleDelete,

package/dist/_pkgs/affine-block-root/keyboard/shortcuts.d.ts

@@ -0,0 +1,8 @@
+import type { ShortcutDescriptor } from '../../std/index.js';
+/**
+ * Core (always-on) keyboard shortcuts, expressed as rebindable descriptors.
+ * Migrated out of the imperative `PageKeyboardManager` bindings so the host can
+ * enumerate and override them. Installed by `ShortcutKeymapExtension` (see
+ * root `view.ts`).
+ */
+export declare const coreShortcuts: ShortcutDescriptor[];

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

@@ -0,0 +1,48 @@
+import { IS_WINDOWS } from '../../global/env/index.js';
+/**
+ * Core (always-on) keyboard shortcuts, expressed as rebindable descriptors.
+ * Migrated out of the imperative `PageKeyboardManager` bindings so the host can
+ * enumerate and override them. Installed by `ShortcutKeymapExtension` (see
+ * root `view.ts`).
+ */
+export const coreShortcuts = [
+    {
+        id: 'undo',
+        labelKey: 'com.affine.keyboardShortcuts.undo',
+        defaultKeys: { mac: ['Mod', 'z'], other: ['Mod', 'z'] },
+        scope: 'global',
+        owner: 'core',
+        handler: std => ctx => {
+            ctx.get('defaultState').event.preventDefault();
+            if (std.store.canUndo)
+                std.store.undo();
+        },
+    },
+    {
+        id: 'redo',
+        labelKey: 'com.affine.keyboardShortcuts.redo',
+        defaultKeys: { mac: ['Shift', 'Mod', 'z'], other: ['Shift', 'Mod', 'z'] },
+        scope: 'global',
+        owner: 'core',
+        handler: std => ctx => {
+            ctx.get('defaultState').event.preventDefault();
+            if (std.store.canRedo)
+                std.store.redo();
+        },
+    },
+    {
+        // Windows-only redo alias (Ctrl+Y); not bound on mac (empty combo).
+        id: 'redo-windows',
+        labelKey: 'com.affine.keyboardShortcuts.redo',
+        defaultKeys: { mac: [], other: ['Control', 'y'] },
+        scope: 'global',
+        owner: 'core',
+        handler: std => ctx => {
+            if (!IS_WINDOWS)
+                return;
+            ctx.get('defaultState').event.preventDefault();
+            if (std.store.canRedo)
+                std.store.redo();
+        },
+    },
+];

package/dist/_pkgs/affine-block-root/view.js

@@ -1,7 +1,7 @@
 import { ViewExtensionProvider, } from '../affine-ext-loader/index.js';
 import { NoteBlockSchema } from '../affine-model/index.js';
 import { ToolbarModuleExtension, ViewportElementExtension, } from '../affine-shared/services/index.js';
-import { BlockFlavourIdentifier, BlockViewExtension, FlavourExtension, } from '../std/index.js';
+import { BlockFlavourIdentifier, BlockViewExtension, FlavourExtension, ShortcutExtension, ShortcutKeymapExtension, } from '../std/index.js';
 import { literal } from 'lit/static-html.js';
 import { PageClipboard, ReadOnlyClipboard } from './clipboard';
 import { builtinToolbarConfig } from './configs/toolbar';
@@ -11,6 +11,7 @@ import { EdgelessLocker } from './edgeless/edgeless-root-spec';
 import { AltCloneExtension } from './edgeless/interact-extensions/clone-ext';
 import { effects } from './effects';
 import { fallbackKeymap } from './keyboard/keymap';
+import { coreShortcuts } from './keyboard/shortcuts';
 export class RootViewExtension extends ViewExtensionProvider {
     constructor() {
         super(...arguments);
@@ -53,6 +54,10 @@ export class RootViewExtension extends ViewExtensionProvider {
         context.register([
             FlavourExtension('affine:page'),
             fallbackKeymap,
+            // Enumerable, host-overridable shortcuts. Core undo/redo live here; the
+            // installer binds the effective keymap (see `@labre/std` shortcut.ts).
+            ShortcutExtension(coreShortcuts),
+            ShortcutKeymapExtension('global'),
             ToolbarModuleExtension({
                 id: BlockFlavourIdentifier(NoteBlockSchema.model.flavour),
                 config: builtinToolbarConfig,

package/dist/_pkgs/affine-gfx-link/effects.js

@@ -1,4 +1,4 @@
-import { EdgelessLinkToolButton } from './toolbar/link-tool-button';
+import { EdgelessUndoToolButton } from './toolbar/undo-tool-button';
 export function effects() {
-    customElements.define('edgeless-link-tool-button', EdgelessLinkToolButton);
+    customElements.define('edgeless-undo-tool-button', EdgelessUndoToolButton);
 }

package/dist/_pkgs/affine-gfx-link/toolbar/undo-dense-menu.d.ts

@@ -0,0 +1,3 @@
+import type { DenseMenuBuilder } from '../../affine-widget-edgeless-toolbar/index.js';
+/** Dense-mode (narrow / mobile toolbar) entry for the undo action. */
+export declare const buildUndoDenseMenu: DenseMenuBuilder;

package/dist/_pkgs/affine-gfx-link/toolbar/undo-dense-menu.js

@@ -0,0 +1,12 @@
+import { menu } from '../../affine-components/context-menu/index.js';
+import { UndoIcon } from '@blocksuite/icons/lit';
+/** Dense-mode (narrow / mobile toolbar) entry for the undo action. */
+export const buildUndoDenseMenu = edgeless => menu.action({
+    name: 'Undo',
+    prefix: UndoIcon(),
+    select: () => {
+        const { store } = edgeless;
+        if (store.canUndo)
+            store.undo();
+    },
+});

package/dist/_pkgs/affine-gfx-link/toolbar/undo-tool-button.d.ts

@@ -0,0 +1,18 @@
+import { LitElement } from 'lit';
+declare const EdgelessUndoToolButton_base: typeof LitElement & import("../../global/utils/types.js").Constructor<import("../../affine-widget-edgeless-toolbar/index.js").QuickToolMixinClass>;
+/**
+ * Edgeless quick-tool "undo" button. It took over the slot of the former link
+ * quick tool (see `undo-tool.ts`). It is an action, not a tool mode, so `type`
+ * is empty (the button never renders as "active").
+ *
+ * ponytail: always clickable; the click is a no-op when there is nothing to
+ * undo. A reactive disabled state would need the history `canUndo$` signal,
+ * which `Store` does not expose today — not worth wiring for this button.
+ */
+export declare class EdgelessUndoToolButton extends EdgelessUndoToolButton_base {
+    static styles: import("lit").CSSResult;
+    type: never[];
+    private _onClick;
+    render(): import("lit-html").TemplateResult<1>;
+}
+export {};

package/dist/_pkgs/affine-gfx-link/toolbar/undo-tool-button.js

@@ -0,0 +1,41 @@
+import { QuickToolMixin } from '../../affine-widget-edgeless-toolbar/index.js';
+import { UndoIcon } from '@blocksuite/icons/lit';
+import { css, html, LitElement } from 'lit';
+/**
+ * Edgeless quick-tool "undo" button. It took over the slot of the former link
+ * quick tool (see `undo-tool.ts`). It is an action, not a tool mode, so `type`
+ * is empty (the button never renders as "active").
+ *
+ * ponytail: always clickable; the click is a no-op when there is nothing to
+ * undo. A reactive disabled state would need the history `canUndo$` signal,
+ * which `Store` does not expose today — not worth wiring for this button.
+ */
+export class EdgelessUndoToolButton extends QuickToolMixin(LitElement) {
+    constructor() {
+        super(...arguments);
+        this.type = [];
+    }
+    static { this.styles = css `
+    .undo-icon,
+    .undo-icon > svg {
+      width: 24px;
+      height: 24px;
+    }
+  `; }
+    _onClick() {
+        const { store } = this.edgeless;
+        if (store.canUndo)
+            store.undo();
+    }
+    render() {
+        return html `<edgeless-tool-icon-button
+      .iconContainerPadding="${6}"
+      .tooltip="${'Undo'}"
+      .tooltipOffset=${17}
+      class="edgeless-undo-tool-button"
+      @click=${this._onClick}
+    >
+      <span class="undo-icon">${UndoIcon()}</span>
+    </edgeless-tool-icon-button>`;
+    }
+}

package/dist/_pkgs/affine-gfx-link/undo-tool.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Undo quick tool. It replaces the former link quick tool in the edgeless
+ * toolbar (same slot, next to `frame`). Wired to the store undo command, the
+ * same one the Ctrl/Cmd-Z shortcut uses.
+ */
+export declare const undoQuickTool: import("../store/index.js").ExtensionType;

package/dist/_pkgs/affine-gfx-link/undo-tool.js

@@ -0,0 +1,17 @@
+import { QuickToolExtension } from '../affine-widget-edgeless-toolbar/index.js';
+import { html } from 'lit';
+import { buildUndoDenseMenu } from './toolbar/undo-dense-menu';
+/**
+ * Undo quick tool. It replaces the former link quick tool in the edgeless
+ * toolbar (same slot, next to `frame`). Wired to the store undo command, the
+ * same one the Ctrl/Cmd-Z shortcut uses.
+ */
+export const undoQuickTool = QuickToolExtension('undo', ({ block, gfx }) => {
+    return {
+        content: html `<edgeless-undo-tool-button
+      .edgeless=${block}
+    ></edgeless-undo-tool-button>`,
+        menu: buildUndoDenseMenu(block, gfx),
+        enable: !block.store.readonly,
+    };
+});

package/dist/_pkgs/affine-gfx-link/view.js

@@ -1,6 +1,8 @@
 import { ViewExtensionProvider, } from '../affine-ext-loader/index.js';
 import { effects } from './effects';
-import { linkQuickTool } from './link-tool';
+import { undoQuickTool } from './undo-tool';
+// This gfx package historically shipped the edgeless "link" quick tool; it now
+// ships the "undo" quick tool, which took over that toolbar slot (see #27).
 export class LinkViewExtension extends ViewExtensionProvider {
     constructor() {
         super(...arguments);
@@ -13,7 +15,7 @@ export class LinkViewExtension extends ViewExtensionProvider {
     setup(context) {
         super.setup(context);
         if (this.isEdgeless(context.scope)) {
-            context.register(linkQuickTool);
+            context.register(undoQuickTool);
         }
     }
 }

package/dist/_pkgs/affine-gfx-mindmap/toolbar/mindmap-tool-button.js

@@ -77,6 +77,9 @@ let EdgelessMindmapToolButton = (() => {
       display: flex;
       justify-content: center;
       align-items: center;
+      /* Treat the whole button as a tap target (no double-tap zoom / tap delay
+       * on touch browsers like Firefox mobile). */
+      touch-action: manipulation;
     }
     .partial-clip {
       flex-shrink: 0;
@@ -104,8 +107,10 @@ let EdgelessMindmapToolButton = (() => {
     }
     .basket-tool-item svg {
       display: block;
-      max-width: 46px;
-      max-height: 46px;
+      /* Render near the icons' natural size (58x44 / 64x48) so the mindmap
+       * button reads at the same size as its neighbours (text / add-file). */
+      max-width: 64px;
+      max-height: 50px;
       width: auto;
       height: auto;
     }
@@ -202,6 +207,11 @@ let EdgelessMindmapToolButton = (() => {
                 scopeElement: this.toolbarContainer,
                 standardWidth: 100,
                 clickToDrag: false,
+                // On touch, the drag controller calls preventDefault on touchstart, so the
+                // native click that opens the menu never fires (button is "dead" on
+                // mobile, or only its non-icon edge responds). A tap without drag fires
+                // onElementClick instead — wire it to the same toggle as the button click.
+                onElementClick: () => this._toggleMenu(),
                 onOverlayCreated: (overlay, { data }) => {
                     const tool = this.draggableTools.find(t => t.name === data.name);
                     if (!tool)
@@ -347,6 +357,7 @@ let EdgelessMindmapToolButton = (() => {
                     preview: tool.icon,
                     standardWidth: tool.standardWidth,
                 })}
+                  @click=${(e) => e.stopPropagation()}
                   class="basket-tool-item current ${tool.name}"
                 >
                   ${tool.icon}

package/dist/_pkgs/affine-gfx-mindmap/toolbar/senior-tool.d.ts

@@ -1,3 +1,13 @@
 export declare const mindMapSeniorTool: import("../../store/index.js").ExtensionType;
-/** The "Others" button: free-text + add-file (mindmap moved to its own tool). */
-export declare const otherSeniorTool: import("../../store/index.js").ExtensionType;
+/**
+ * Standalone "Text" tool. Promoted out of the former "Others" submenu: a single
+ * tap inserts an editable text element at the viewport center. Reuses the
+ * submenu's `textRender` action.
+ */
+export declare const textSeniorTool: import("../../store/index.js").ExtensionType;
+/**
+ * Standalone "Add file" tool. Promoted out of the former "Others" submenu: a
+ * single tap opens the file picker and inserts the image/attachment at the
+ * viewport center. Reuses the submenu's `mediaRender` action.
+ */
+export declare const mediaSeniorTool: import("../../store/index.js").ExtensionType;

package/dist/_pkgs/affine-gfx-mindmap/toolbar/senior-tool.js

@@ -1,5 +1,8 @@
 import { SeniorToolExtension } from '../../affine-widget-edgeless-toolbar/index.js';
+import { Bound } from '../../global/gfx/index.js';
 import { html } from 'lit';
+import { mediaRender, textRender } from './basket-elements';
+import { mindmapMenuMediaIcon, textIcon } from './icons';
 export const mindMapSeniorTool = SeniorToolExtension('mindMap', ({ block, toolbarContainer }) => {
     return {
         name: 'Mind Map',
@@ -10,14 +13,62 @@ export const mindMapSeniorTool = SeniorToolExtension('mindMap', ({ block, toolba
       ></edgeless-mindmap-tool-button>`,
     };
 });
-/** The "Others" button: free-text + add-file (mindmap moved to its own tool). */
-export const otherSeniorTool = SeniorToolExtension('other', ({ block, toolbarContainer }) => {
-    return {
-        name: 'Others',
-        content: html `<edgeless-mindmap-tool-button
-        .edgeless=${block}
-        .toolbarContainer=${toolbarContainer}
-        .variant=${'other'}
-      ></edgeless-mindmap-tool-button>`,
-    };
-});
+// Reuse the (nicely drawn) icons from the former "Others" submenu, with a
+// playful resting tilt that pops upright + scales on hover — echoing the old
+// basket hover animation.
+const slot = (icon, tooltip, onClick) => html `<style>
+      .promoted-tool {
+        width: 100%;
+        height: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+      .promoted-tool .promoted-tool-icon {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        /* Scale the drawn icons up so they read at the same size as the
+         * neighbouring pen/shape icons (their natural SVG size is smaller). */
+        transform: rotate(-4deg) scale(1.4);
+        transition: transform 0.24s cubic-bezier(0.34, 1.56, 0.64, 1);
+      }
+      .promoted-tool:hover .promoted-tool-icon {
+        transform: rotate(0deg) scale(1.65);
+      }
+      .promoted-tool .promoted-tool-icon svg {
+        width: auto;
+        height: auto;
+        max-width: 52px;
+        max-height: 44px;
+      }
+    </style>
+    <div class="promoted-tool">
+      <edgeless-tool-icon-button .tooltip=${tooltip} @click=${onClick}>
+        <span class="promoted-tool-icon">${icon}</span>
+      </edgeless-tool-icon-button>
+    </div>`;
+/**
+ * Standalone "Text" tool. Promoted out of the former "Others" submenu: a single
+ * tap inserts an editable text element at the viewport center. Reuses the
+ * submenu's `textRender` action.
+ */
+export const textSeniorTool = SeniorToolExtension('edgeless-text', ({ block, gfx }) => ({
+    name: 'Text',
+    content: slot(textIcon, 'Text', () => {
+        const { centerX, centerY } = gfx.viewport;
+        void textRender(new Bound(centerX - 50, centerY - 16, 100, 32), block);
+    }),
+}));
+/**
+ * Standalone "Add file" tool. Promoted out of the former "Others" submenu: a
+ * single tap opens the file picker and inserts the image/attachment at the
+ * viewport center. Reuses the submenu's `mediaRender` action.
+ */
+export const mediaSeniorTool = SeniorToolExtension('edgeless-media', ({ block, gfx }) => ({
+    name: 'Add file',
+    content: slot(mindmapMenuMediaIcon, 'Add file', () => {
+        const { centerX, centerY } = gfx.viewport;
+        void mediaRender(new Bound(centerX - 50, centerY - 50, 100, 100), block);
+    }),
+}));

package/dist/_pkgs/affine-gfx-mindmap/view.d.ts

@@ -15,8 +15,19 @@ export declare class MindmapToolViewExtension extends ViewExtensionProvider {
     name: string;
     setup(context: ViewExtensionContext): void;
 }
-/** The "Others" senior button (free-text + add-file) — flag-gated (`other`). */
-export declare class OtherToolViewExtension extends ViewExtensionProvider {
+/**
+ * Standalone "Text" senior button (formerly inside the "Others" submenu) —
+ * flag-gated (`edgeless-text`).
+ */
+export declare class TextToolViewExtension extends ViewExtensionProvider {
+    name: string;
+    setup(context: ViewExtensionContext): void;
+}
+/**
+ * Standalone "Add file" senior button (formerly inside the "Others" submenu) —
+ * flag-gated (`edgeless-media`).
+ */
+export declare class MediaToolViewExtension extends ViewExtensionProvider {
     name: string;
     setup(context: ViewExtensionContext): void;
 }

package/dist/_pkgs/affine-gfx-mindmap/view.js

@@ -5,7 +5,7 @@ import { MindmapElementRendererExtension } from './element-renderer';
 import { MindMapIndicatorOverlay } from './indicator-overlay';
 import { MindMapDragExtension } from './interactivity';
 import { mindmapToolbarExtension, shapeMindmapToolbarExtension, } from './toolbar/config';
-import { mindMapSeniorTool, otherSeniorTool } from './toolbar/senior-tool';
+import { mediaSeniorTool, mindMapSeniorTool, textSeniorTool, } from './toolbar/senior-tool';
 import { mindmapTemplateCategory } from './templates';
 import { MindMapInteraction, MindMapView } from './view/view';
 /**
@@ -48,16 +48,35 @@ export class MindmapToolViewExtension extends ViewExtensionProvider {
         }
     }
 }
-/** The "Others" senior button (free-text + add-file) — flag-gated (`other`). */
-export class OtherToolViewExtension extends ViewExtensionProvider {
+/**
+ * Standalone "Text" senior button (formerly inside the "Others" submenu) —
+ * flag-gated (`edgeless-text`).
+ */
+export class TextToolViewExtension extends ViewExtensionProvider {
+    constructor() {
+        super(...arguments);
+        this.name = 'affine-edgeless-text-tool-gfx';
+    }
+    setup(context) {
+        super.setup(context);
+        if (this.isEdgeless(context.scope)) {
+            context.register(textSeniorTool);
+        }
+    }
+}
+/**
+ * Standalone "Add file" senior button (formerly inside the "Others" submenu) —
+ * flag-gated (`edgeless-media`).
+ */
+export class MediaToolViewExtension extends ViewExtensionProvider {
     constructor() {
         super(...arguments);
-        this.name = 'affine-other-gfx';
+        this.name = 'affine-edgeless-media-tool-gfx';
     }
     setup(context) {
         super.setup(context);
         if (this.isEdgeless(context.scope)) {
-            context.register(otherSeniorTool);
+            context.register(mediaSeniorTool);
         }
     }
 }

package/dist/_pkgs/affine-shared/services/index.d.ts

@@ -13,7 +13,9 @@ export * from './feature-flag-service';
 export * from './file-size-limit-service';
 export * from './font-loader';
 export * from './generate-url-service';
+export * from './keymap-override-service';
 export * from './link-preview-service';
+export * from './linked-doc-content-service';
 export * from './linked-doc-creation-service';
 export * from './native-clipboard-service';
 export * from './notification-service';

package/dist/_pkgs/affine-shared/services/index.js

@@ -13,7 +13,9 @@ export * from './feature-flag-service';
 export * from './file-size-limit-service';
 export * from './font-loader';
 export * from './generate-url-service';
+export * from './keymap-override-service';
 export * from './link-preview-service';
+export * from './linked-doc-content-service';
 export * from './linked-doc-creation-service';
 export * from './native-clipboard-service';
 export * from './notification-service';

package/dist/_pkgs/affine-shared/services/keymap-override-service.d.ts

@@ -0,0 +1,15 @@
+import { type ShortcutConflictReporter, type ShortcutOverrides } from '../../std/index.js';
+import type { ExtensionType } from '../../store/index.js';
+/**
+ * Host-injected shortcut rebinding table. Each entry maps a shortcut id to a
+ * combo (array of keys, e.g. `['Ctrl', 'Shift', 'Z']`) or `'disabled'`. The
+ * effective keymap is `override ?? default`; `'disabled'` removes the binding.
+ *
+ * Mirrors `TelemetryExtension` / `EditorSettingExtension`.
+ */
+export declare function KeymapOverrideExtension(overrides: ShortcutOverrides): ExtensionType;
+/**
+ * Host-injected sink for combo conflicts detected within a scope. Without it,
+ * conflicts are logged to the console.
+ */
+export declare function ShortcutConflictReporterExtension(reporter: ShortcutConflictReporter): ExtensionType;

package/dist/_pkgs/affine-shared/services/keymap-override-service.js

@@ -0,0 +1,26 @@
+import { ShortcutConflictReporterIdentifier, ShortcutOverrideIdentifier, } from '../../std/index.js';
+/**
+ * Host-injected shortcut rebinding table. Each entry maps a shortcut id to a
+ * combo (array of keys, e.g. `['Ctrl', 'Shift', 'Z']`) or `'disabled'`. The
+ * effective keymap is `override ?? default`; `'disabled'` removes the binding.
+ *
+ * Mirrors `TelemetryExtension` / `EditorSettingExtension`.
+ */
+export function KeymapOverrideExtension(overrides) {
+    return {
+        setup: di => {
+            di.override(ShortcutOverrideIdentifier, () => overrides);
+        },
+    };
+}
+/**
+ * Host-injected sink for combo conflicts detected within a scope. Without it,
+ * conflicts are logged to the console.
+ */
+export function ShortcutConflictReporterExtension(reporter) {
+    return {
+        setup: di => {
+            di.override(ShortcutConflictReporterIdentifier, () => reporter);
+        },
+    };
+}