@formicoidea/labre-core 0.26.1 → 0.29.0

package/dist/_pkgs/std/gfx/model/surface/element-model.d.ts

@@ -100,6 +100,13 @@ export declare abstract class GfxPrimitiveElementModel<Props extends BaseElement
     accessor externalXYWH: SerializedXYWH | undefined;
     accessor hidden: boolean;
     accessor index: string;
+    /**
+     * Minimal link target attached to the element. At most one is set.
+     * Opaque to the framework; an affine widget shows a hover arrow that
+     * opens the doc ({@link linkedDocId}) or the URL ({@link externalLink}).
+     */
+    accessor externalLink: string | undefined;
+    accessor linkedDocId: string | undefined;
     accessor lockedBySelf: boolean | undefined;
     accessor opacity: number;
     accessor responseExtension: [number, number];

package/dist/_pkgs/std/gfx/model/surface/element-model.js

@@ -55,6 +55,12 @@ let GfxPrimitiveElementModel = (() => {
     let _index_decorators;
     let _index_initializers = [];
     let _index_extraInitializers = [];
+    let _externalLink_decorators;
+    let _externalLink_initializers = [];
+    let _externalLink_extraInitializers = [];
+    let _linkedDocId_decorators;
+    let _linkedDocId_initializers = [];
+    let _linkedDocId_extraInitializers = [];
     let _lockedBySelf_decorators;
     let _lockedBySelf_initializers = [];
     let _lockedBySelf_extraInitializers = [];
@@ -76,6 +82,8 @@ let GfxPrimitiveElementModel = (() => {
                 }), local()];
             _hidden_decorators = [field(false)];
             _index_decorators = [field()];
+            _externalLink_decorators = [field()];
+            _linkedDocId_decorators = [field()];
             _lockedBySelf_decorators = [field()];
             _opacity_decorators = [local()];
             _responseExtension_decorators = [local()];
@@ -84,6 +92,8 @@ let GfxPrimitiveElementModel = (() => {
             __esDecorate(this, null, _externalXYWH_decorators, { kind: "accessor", name: "externalXYWH", static: false, private: false, access: { has: obj => "externalXYWH" in obj, get: obj => obj.externalXYWH, set: (obj, value) => { obj.externalXYWH = value; } }, metadata: _metadata }, _externalXYWH_initializers, _externalXYWH_extraInitializers);
             __esDecorate(this, null, _hidden_decorators, { kind: "accessor", name: "hidden", static: false, private: false, access: { has: obj => "hidden" in obj, get: obj => obj.hidden, set: (obj, value) => { obj.hidden = value; } }, metadata: _metadata }, _hidden_initializers, _hidden_extraInitializers);
             __esDecorate(this, null, _index_decorators, { kind: "accessor", name: "index", static: false, private: false, access: { has: obj => "index" in obj, get: obj => obj.index, set: (obj, value) => { obj.index = value; } }, metadata: _metadata }, _index_initializers, _index_extraInitializers);
+            __esDecorate(this, null, _externalLink_decorators, { kind: "accessor", name: "externalLink", static: false, private: false, access: { has: obj => "externalLink" in obj, get: obj => obj.externalLink, set: (obj, value) => { obj.externalLink = value; } }, metadata: _metadata }, _externalLink_initializers, _externalLink_extraInitializers);
+            __esDecorate(this, null, _linkedDocId_decorators, { kind: "accessor", name: "linkedDocId", static: false, private: false, access: { has: obj => "linkedDocId" in obj, get: obj => obj.linkedDocId, set: (obj, value) => { obj.linkedDocId = value; } }, metadata: _metadata }, _linkedDocId_initializers, _linkedDocId_extraInitializers);
             __esDecorate(this, null, _lockedBySelf_decorators, { kind: "accessor", name: "lockedBySelf", static: false, private: false, access: { has: obj => "lockedBySelf" in obj, get: obj => obj.lockedBySelf, set: (obj, value) => { obj.lockedBySelf = value; } }, metadata: _metadata }, _lockedBySelf_initializers, _lockedBySelf_extraInitializers);
             __esDecorate(this, null, _opacity_decorators, { kind: "accessor", name: "opacity", static: false, private: false, access: { has: obj => "opacity" in obj, get: obj => obj.opacity, set: (obj, value) => { obj.opacity = value; } }, metadata: _metadata }, _opacity_initializers, _opacity_extraInitializers);
             __esDecorate(this, null, _responseExtension_decorators, { kind: "accessor", name: "responseExtension", static: false, private: false, access: { has: obj => "responseExtension" in obj, get: obj => obj.responseExtension, set: (obj, value) => { obj.responseExtension = value; } }, metadata: _metadata }, _responseExtension_initializers, _responseExtension_extraInitializers);
@@ -162,7 +172,9 @@ let GfxPrimitiveElementModel = (() => {
             this.#externalXYWH_accessor_storage = (__runInitializers(this, _display_extraInitializers), __runInitializers(this, _externalXYWH_initializers, undefined));
             this.#hidden_accessor_storage = (__runInitializers(this, _externalXYWH_extraInitializers), __runInitializers(this, _hidden_initializers, false));
             this.#index_accessor_storage = (__runInitializers(this, _hidden_extraInitializers), __runInitializers(this, _index_initializers, void 0));
-            this.#lockedBySelf_accessor_storage = (__runInitializers(this, _index_extraInitializers), __runInitializers(this, _lockedBySelf_initializers, false));
+            this.#externalLink_accessor_storage = (__runInitializers(this, _index_extraInitializers), __runInitializers(this, _externalLink_initializers, undefined));
+            this.#linkedDocId_accessor_storage = (__runInitializers(this, _externalLink_extraInitializers), __runInitializers(this, _linkedDocId_initializers, undefined));
+            this.#lockedBySelf_accessor_storage = (__runInitializers(this, _linkedDocId_extraInitializers), __runInitializers(this, _lockedBySelf_initializers, false));
             this.#opacity_accessor_storage = (__runInitializers(this, _lockedBySelf_extraInitializers), __runInitializers(this, _opacity_initializers, 1));
             this.#responseExtension_accessor_storage = (__runInitializers(this, _opacity_extraInitializers), __runInitializers(this, _responseExtension_initializers, [0, 0]));
             this.#seed_accessor_storage = (__runInitializers(this, _responseExtension_extraInitializers), __runInitializers(this, _seed_initializers, void 0));
@@ -294,6 +306,17 @@ let GfxPrimitiveElementModel = (() => {
         #index_accessor_storage;
         get index() { return this.#index_accessor_storage; }
         set index(value) { this.#index_accessor_storage = value; }
+        #externalLink_accessor_storage;
+        /**
+         * Minimal link target attached to the element. At most one is set.
+         * Opaque to the framework; an affine widget shows a hover arrow that
+         * opens the doc ({@link linkedDocId}) or the URL ({@link externalLink}).
+         */
+        get externalLink() { return this.#externalLink_accessor_storage; }
+        set externalLink(value) { this.#externalLink_accessor_storage = value; }
+        #linkedDocId_accessor_storage;
+        get linkedDocId() { return this.#linkedDocId_accessor_storage; }
+        set linkedDocId(value) { this.#linkedDocId_accessor_storage = value; }
         #lockedBySelf_accessor_storage;
         get lockedBySelf() { return this.#lockedBySelf_accessor_storage; }
         set lockedBySelf(value) { this.#lockedBySelf_accessor_storage = value; }

package/dist/_pkgs/std/identifier.d.ts

@@ -1,6 +1,7 @@
 import type { Command } from './command/index.js';
 import type { EventOptions, UIEventHandler } from './event/index.js';
 import type { BlockService, LifeCycleWatcher } from './extension/index.js';
+import type { ShortcutConflictReporter, ShortcutDescriptor, ShortcutOverrides } from './extension/shortcut.js';
 import type { BlockStdScope } from './scope/index.js';
 import type { BlockViewType } from './spec/type.js';
 export declare const BlockServiceIdentifier: import("../global/di/types.js").ServiceIdentifier<BlockService> & (<U extends BlockService = BlockService>(variant: import("../global/di/types.js").ServiceVariant) => import("../global/di/types.js").ServiceIdentifier<U>);
@@ -27,3 +28,9 @@ export declare const KeymapIdentifier: import("../global/di/types.js").ServiceId
     getter: (std: BlockStdScope) => Record<string, UIEventHandler>;
     options?: EventOptions;
 }>(variant: import("../global/di/types.js").ServiceVariant) => import("../global/di/types.js").ServiceIdentifier<U>);
+/** Multi-instance: one registered {@link ShortcutDescriptor} per impl. */
+export declare const ShortcutIdentifier: import("../global/di/types.js").ServiceIdentifier<ShortcutDescriptor> & (<U extends ShortcutDescriptor = ShortcutDescriptor>(variant: import("../global/di/types.js").ServiceVariant) => import("../global/di/types.js").ServiceIdentifier<U>);
+/** Host-injected rebinding table (see `KeymapOverrideExtension`). */
+export declare const ShortcutOverrideIdentifier: import("../global/di/types.js").ServiceIdentifier<ShortcutOverrides> & (<U extends ShortcutOverrides = ShortcutOverrides>(variant: import("../global/di/types.js").ServiceVariant) => import("../global/di/types.js").ServiceIdentifier<U>);
+/** Host-injected sink for reported combo conflicts. */
+export declare const ShortcutConflictReporterIdentifier: import("../global/di/types.js").ServiceIdentifier<ShortcutConflictReporter> & (<U extends ShortcutConflictReporter = ShortcutConflictReporter>(variant: import("../global/di/types.js").ServiceVariant) => import("../global/di/types.js").ServiceIdentifier<U>);

package/dist/_pkgs/std/identifier.js

@@ -8,3 +8,9 @@ export const WidgetViewIdentifier = createIdentifier('WidgetView');
 export const LifeCycleWatcherIdentifier = createIdentifier('LifeCycleWatcher');
 export const StdIdentifier = createIdentifier('Std');
 export const KeymapIdentifier = createIdentifier('Keymap');
+/** Multi-instance: one registered {@link ShortcutDescriptor} per impl. */
+export const ShortcutIdentifier = createIdentifier('Shortcut');
+/** Host-injected rebinding table (see `KeymapOverrideExtension`). */
+export const ShortcutOverrideIdentifier = createIdentifier('ShortcutOverride');
+/** Host-injected sink for reported combo conflicts. */
+export const ShortcutConflictReporterIdentifier = createIdentifier('ShortcutConflictReporter');

package/dist/_pkgs/std/inline/components/v-element.js

@@ -90,9 +90,12 @@ let VElement = (() => {
         }
         async getUpdateComplete() {
             const result = await super.getUpdateComplete();
+            // The inner span (and its child) may not be in the DOM yet when this is
+            // awaited mid mount/unmount — guard instead of throwing on `null`.
             const span = this.querySelector('[data-v-element="true"]');
-            const el = span.firstElementChild;
-            await el.updateComplete;
+            const el = span?.firstElementChild;
+            if (el)
+                await el.updateComplete;
             const vTexts = Array.from(this.querySelectorAll('v-text'));
             await Promise.all(vTexts.map(vText => vText.updateComplete));
             return result;

package/dist/extensions/view.js

@@ -27,7 +27,7 @@ import { BrushViewExtension } from '../_pkgs/affine-gfx-brush/view.js';
 import { ConnectorViewExtension } from '../_pkgs/affine-gfx-connector/view.js';
 import { GroupViewExtension } from '../_pkgs/affine-gfx-group/view.js';
 import { LinkViewExtension as GfxLinkViewExtension } from '../_pkgs/affine-gfx-link/view.js';
-import { MindmapRenderViewExtension, MindmapToolViewExtension, OtherToolViewExtension, } from '../_pkgs/affine-gfx-mindmap/view.js';
+import { MediaToolViewExtension, MindmapRenderViewExtension, MindmapToolViewExtension, TextToolViewExtension, } from '../_pkgs/affine-gfx-mindmap/view.js';
 import { NoteViewExtension as GfxNoteViewExtension } from '../_pkgs/affine-gfx-note/view.js';
 import { PointerViewExtension } from '../_pkgs/affine-gfx-pointer/view.js';
 import { ShapeViewExtension } from '../_pkgs/affine-gfx-shape/view.js';
@@ -69,11 +69,14 @@ export function getInternalViewExtensions(flags) {
         PointerViewExtension,
         GfxNoteViewExtension,
         ...(on('brush') ? [BrushViewExtension] : []),
+        // Standalone text / add-file senior buttons, placed right after pen/eraser
+        // (registration order = senior-row order for the default order group).
+        ...(on('edgeless-text') ? [TextToolViewExtension] : []),
+        ...(on('edgeless-media') ? [MediaToolViewExtension] : []),
         ShapeViewExtension,
         // Mindmap rendering is always on; the flags gate only the senior buttons.
         MindmapRenderViewExtension,
         ...(on('mindmap') ? [MindmapToolViewExtension] : []),
-        ...(on('other') ? [OtherToolViewExtension] : []),
         ConnectorViewExtension,
         GroupViewExtension,
         TextViewExtension,

package/dist/flags.d.ts

@@ -23,7 +23,7 @@
  * - `latex` controls both the latex block and inline latex.
  * - `frame` also controls the frame panel fragment.
  */
-export declare const OPTIONAL_BLOCKS: readonly ["attachment", "bookmark", "callout", "code", "data-view", "database", "divider", "edgeless-text", "embed", "embed-doc", "frame", "image", "latex", "list", "surface-ref", "table", "brush", "mindmap", "other", "template", "link"];
+export declare const OPTIONAL_BLOCKS: readonly ["attachment", "bookmark", "callout", "code", "data-view", "database", "divider", "edgeless-text", "embed", "embed-doc", "frame", "image", "latex", "list", "surface-ref", "table", "brush", "mindmap", "edgeless-text", "edgeless-media", "template", "link"];
 export type OptionalBlock = (typeof OPTIONAL_BLOCKS)[number];
 /** Map of optional block -> enabled. Missing keys default to enabled. */
 export type BlockFlags = Partial<Record<OptionalBlock, boolean>>;

package/dist/flags.js

@@ -43,7 +43,10 @@ export const OPTIONAL_BLOCKS = [
     // gfx modules
     'brush',
     'mindmap',
-    'other',
+    // Standalone text / add-file tools, promoted out of the former "Others"
+    // senior submenu (each individually toggleable).
+    'edgeless-text',
+    'edgeless-media',
     'template',
     'link',
 ];

package/dist/shortcuts.d.ts

@@ -0,0 +1,24 @@
+import type { ShortcutDescriptor } from './_pkgs/std/index.js';
+import { type BlockFlags, type OptionalBlock } from './flags.js';
+/**
+ * Manifest view of a shortcut: the metadata a host "Shortcuts" settings panel
+ * needs, without the runtime `handler`.
+ */
+export type ShortcutManifestEntry = Omit<ShortcutDescriptor, 'handler'>;
+interface FrameworkShortcutGroup {
+    owner: OptionalBlock;
+    shortcuts: ShortcutDescriptor[];
+}
+/**
+ * Pure aggregator (exported for testing): core shortcuts plus the shortcuts of
+ * every framework group whose flag is enabled.
+ */
+export declare function buildShortcutManifest(core: ShortcutDescriptor[], groups: FrameworkShortcutGroup[], flags?: BlockFlags): ShortcutManifestEntry[];
+/**
+ * The enumerable shortcut manifest for a given flag set: core shortcuts plus
+ * the shortcuts contributed by the currently-enabled frameworks. Enumerable
+ * without an editor instance (for a settings panel). Mirrors the flag gating of
+ * `getInternalViewExtensions`.
+ */
+export declare function getShortcutManifest(flags?: BlockFlags): ShortcutManifestEntry[];
+export {};

package/dist/shortcuts.js

@@ -0,0 +1,39 @@
+import { coreShortcuts } from './_pkgs/affine-block-root/index.js';
+import { isBlockEnabled } from './flags.js';
+/**
+ * Per-framework shortcut contributions. A framework that adds shortcuts lists
+ * them here (manifest) AND registers `ShortcutExtension(...)` in its view
+ * (runtime binding); both are gated by its flag. No framework ships shortcuts
+ * yet — the seam is ready and the manifest currently returns core only.
+ */
+const FRAMEWORK_SHORTCUT_GROUPS = [];
+const toEntry = (d) => ({
+    id: d.id,
+    labelKey: d.labelKey,
+    defaultKeys: d.defaultKeys,
+    scope: d.scope,
+    owner: d.owner,
+    when: d.when,
+});
+/**
+ * Pure aggregator (exported for testing): core shortcuts plus the shortcuts of
+ * every framework group whose flag is enabled.
+ */
+export function buildShortcutManifest(core, groups, flags) {
+    const entries = core.map(toEntry);
+    for (const { owner, shortcuts } of groups) {
+        if (isBlockEnabled(flags, owner)) {
+            entries.push(...shortcuts.map(toEntry));
+        }
+    }
+    return entries;
+}
+/**
+ * The enumerable shortcut manifest for a given flag set: core shortcuts plus
+ * the shortcuts contributed by the currently-enabled frameworks. Enumerable
+ * without an editor instance (for a settings panel). Mirrors the flag gating of
+ * `getInternalViewExtensions`.
+ */
+export function getShortcutManifest(flags) {
+    return buildShortcutManifest(coreShortcuts, FRAMEWORK_SHORTCUT_GROUPS, flags);
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@formicoidea/labre-core",
   "description": "Labre editor — the full BlockSuite-derived editor as one package.",
-  "version": "0.26.1",
+  "version": "0.29.0",
   "type": "module",
   "sideEffects": false,
   "author": "lajola",
@@ -810,6 +810,10 @@
       "types": "./dist/flags.d.ts",
       "import": "./dist/flags.js"
     },
+    "./shortcuts": {
+      "types": "./dist/shortcuts.d.ts",
+      "import": "./dist/shortcuts.js"
+    },
     "./model": {
       "types": "./dist/model/index.d.ts",
       "import": "./dist/model/index.js"

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

@@ -1 +0,0 @@
-export declare const linkQuickTool: import("../store/index.js").ExtensionType;

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

@@ -1,11 +0,0 @@
-import { QuickToolExtension } from '../affine-widget-edgeless-toolbar/index.js';
-import { html } from 'lit';
-import { buildLinkDenseMenu } from './toolbar/link-dense-menu';
-export const linkQuickTool = QuickToolExtension('link', ({ block, gfx }) => {
-    return {
-        content: html `<edgeless-link-tool-button
-      .edgeless=${block}
-    ></edgeless-link-tool-button>`,
-        menu: buildLinkDenseMenu(block, gfx),
-    };
-});

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

@@ -1,2 +0,0 @@
-import type { DenseMenuBuilder } from '../../affine-widget-edgeless-toolbar/index.js';
-export declare const buildLinkDenseMenu: DenseMenuBuilder;

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

@@ -1,26 +0,0 @@
-import { insertLinkByQuickSearchCommand } from '../../affine-block-bookmark/index.js';
-import { menu } from '../../affine-components/context-menu/index.js';
-import { LinkIcon } from '../../affine-components/icons/index.js';
-import { TelemetryProvider } from '../../affine-shared/services/index.js';
-export const buildLinkDenseMenu = edgeless => menu.action({
-    name: 'Link',
-    prefix: LinkIcon,
-    select: () => {
-        const [_, { insertedLinkType }] = edgeless.std.command.exec(insertLinkByQuickSearchCommand);
-        insertedLinkType
-            ?.then(type => {
-            const flavour = type?.flavour;
-            if (!flavour)
-                return;
-            edgeless.std
-                .getOptional(TelemetryProvider)
-                ?.track('CanvasElementAdded', {
-                control: 'toolbar:general',
-                page: 'whiteboard editor',
-                module: 'toolbar',
-                type: flavour.split(':')[1],
-            });
-        })
-            .catch(console.error);
-    },
-});

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

@@ -1,10 +0,0 @@
-import { DefaultTool } from '../../affine-block-surface/index.js';
-import { LitElement } from 'lit';
-declare const EdgelessLinkToolButton_base: typeof LitElement & import("../../global/utils/types.js").Constructor<import("../../affine-widget-edgeless-toolbar/index.js").QuickToolMixinClass>;
-export declare class EdgelessLinkToolButton extends EdgelessLinkToolButton_base {
-    static styles: import("lit").CSSResult;
-    type: typeof DefaultTool;
-    private _onClick;
-    render(): import("lit-html").TemplateResult<1>;
-}
-export {};

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

@@ -1,84 +0,0 @@
-import { insertLinkByQuickSearchCommand } from '../../affine-block-bookmark/index.js';
-import { insertEmbedCard } from '../../affine-block-embed/index.js';
-import { DefaultTool } from '../../affine-block-surface/index.js';
-import { toggleEmbedCardCreateModal } from '../../affine-components/embed-card-modal/index.js';
-import { LinkIcon } from '../../affine-components/icons/index.js';
-import { TelemetryProvider } from '../../affine-shared/services/index.js';
-import { QuickToolMixin } from '../../affine-widget-edgeless-toolbar/index.js';
-import { GfxControllerIdentifier } from '../../std/gfx/index.js';
-import { css, html, LitElement } from 'lit';
-export class EdgelessLinkToolButton extends QuickToolMixin(LitElement) {
-    constructor() {
-        super(...arguments);
-        this.type = DefaultTool;
-    }
-    static { this.styles = css `
-    .link-icon,
-    .link-icon > svg {
-      width: 24px;
-      height: 24px;
-    }
-  `; }
-    _onClick() {
-        const [success, { insertedLinkType }] = this.edgeless.std.command.exec(insertLinkByQuickSearchCommand);
-        if (!success) {
-            // fallback to create a bookmark block with input modal
-            toggleEmbedCardCreateModal(this.edgeless.host, 'Links', 'The added link will be displayed as a card view.', {
-                mode: 'edgeless',
-                onSave: url => {
-                    insertEmbedCard(this.edgeless.std, {
-                        flavour: 'affine:bookmark',
-                        targetStyle: 'vertical',
-                        props: { url },
-                    });
-                },
-            }, ({ mode }) => {
-                if (mode === 'edgeless') {
-                    const gfx = this.edgeless.std.get(GfxControllerIdentifier);
-                    gfx.tool.setTool(DefaultTool);
-                }
-            }).catch(console.error);
-            return;
-        }
-        insertedLinkType
-            ?.then(type => {
-            const flavour = type?.flavour;
-            if (!flavour)
-                return;
-            this.edgeless.std
-                .getOptional(TelemetryProvider)
-                ?.track('CanvasElementAdded', {
-                control: 'toolbar:general',
-                page: 'whiteboard editor',
-                module: 'toolbar',
-                segment: 'toolbar',
-                type: flavour.split(':')[1],
-            });
-            this.edgeless.std
-                .getOptional(TelemetryProvider)
-                ?.track('LinkedDocCreated', {
-                control: 'links',
-                page: 'whiteboard editor',
-                module: 'edgeless toolbar',
-                segment: 'whiteboard',
-                type: flavour.split(':')[1],
-                other: 'existing doc',
-            });
-        })
-            .catch(console.error);
-    }
-    render() {
-        return html `<edgeless-tool-icon-button
-      .iconContainerPadding="${6}"
-      .tooltip="${html `<affine-tooltip-content-with-shortcut
-        data-tip="${'Link'}"
-        data-shortcut="${'@'}"
-      ></affine-tooltip-content-with-shortcut>`}"
-      .tooltipOffset=${17}
-      class="edgeless-link-tool-button"
-      @click=${this._onClick}
-    >
-      <span class="link-icon">${LinkIcon}</span>
-    </edgeless-tool-icon-button>`;
-    }
-}