@formicoidea/labre-core 0.43.1 → 0.45.0

package/dist/_pkgs/affine-block-embed/embed-iframe-block/configs/toolbar.js

@@ -1,4 +1,4 @@
-import { reassociateConnectorsCommand } from '../../../affine-block-surface/index.js';
+import { applyCreationLayer, reassociateConnectorsCommand, sourceLayerOf, } from '../../../affine-block-surface/index.js';
 import { toast } from '../../../affine-components/toast/index.js';
 import { BookmarkStyles, EmbedIframeBlockModel } from '../../../affine-model/index.js';
 import { EMBED_CARD_HEIGHT, EMBED_CARD_WIDTH, } from '../../../affine-shared/consts/index.js';
@@ -292,7 +292,16 @@ export const builtinSurfaceToolbarConfig = {
                         const bounds = Bound.deserialize(xywh);
                         bounds.w = EMBED_CARD_WIDTH[style];
                         bounds.h = EMBED_CARD_HEIGHT[style];
-                        const newId = ctx.store.addBlock(flavour, { url, caption, style, xywh: bounds.serialize() }, parent);
+                        // The card takes the iframe's place, layer included (ADR 0031 §6).
+                        const props = {
+                            url,
+                            caption,
+                            style,
+                            xywh: bounds.serialize(),
+                            layer: sourceLayerOf(model),
+                        };
+                        applyCreationLayer(ctx.std, props);
+                        const newId = ctx.store.addBlock(flavour, props, parent);
                         ctx.command.exec(reassociateConnectorsCommand, { oldId, newId });
                         ctx.store.deleteBlock(model);
                         // Selects new block

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

@@ -1,5 +1,5 @@
 import { createEmbedEdgelessBlockInteraction, toEdgelessEmbedBlock, } from '../../affine-block-embed/index.js';
-import { EdgelessCRUDIdentifier, reassociateConnectorsCommand, } from '../../affine-block-surface/index.js';
+import { EdgelessCRUDIdentifier, reassociateConnectorsCommand, sourceLayerOf, } from '../../affine-block-surface/index.js';
 import { EmbedLinkedDocBlockSchema } from '../../affine-model/index.js';
 import { EMBED_CARD_HEIGHT, EMBED_CARD_WIDTH, } from '../../affine-shared/consts/index.js';
 import { cloneReferenceInfoWithoutAliases, isNewTabTrigger, isNewViewTrigger, } from '../../affine-shared/utils/index.js';
@@ -21,6 +21,8 @@ export class EmbedEdgelessLinkedDocBlockComponent extends toEdgelessEmbedBlock(E
                 xywh: bound.serialize(),
                 caption,
                 ...cloneReferenceInfoWithoutAliases(this.referenceInfo$.peek()),
+                // In the linked doc's layer, not the active one (ADR 0031 §6).
+                layer: sourceLayerOf(this.model),
             }, surface);
             this.std.command.exec(reassociateConnectorsCommand, {
                 oldId: id,

package/dist/_pkgs/affine-block-embed-doc/embed-synced-doc-block/configs/toolbar.js

@@ -1,3 +1,4 @@
+import { applyCreationLayer, sourceLayerOf } from '../../../affine-block-surface/index.js';
 import { toast } from '../../../affine-components/toast/index.js';
 import { EditorChevronDown } from '../../../affine-components/toolbar/index.js';
 import { DEFAULT_NOTE_HEIGHT, DEFAULT_NOTE_WIDTH, EmbedSyncedDocModel, NoteBlockModel, NoteDisplayMode, } from '../../../affine-model/index.js';
@@ -297,11 +298,15 @@ const builtinSurfaceToolbarConfig = {
                             PADDING;
                         const y = syncedDocModel.elementBound.y;
                         const children = await draftedModels;
-                        const noteId = std.store.addBlock('affine:note', {
+                        const props = {
                             xywh: new Bound(x, y, DEFAULT_NOTE_WIDTH, DEFAULT_NOTE_HEIGHT).serialize(),
                             index: gfx.layer.generateIndex(),
                             displayMode: NoteDisplayMode.EdgelessOnly,
-                        }, ctx.store.root);
+                            // Beside the synced doc, in its layer (ADR 0031 §6).
+                            layer: sourceLayerOf(syncedDocModel),
+                        };
+                        applyCreationLayer(std, props);
+                        const noteId = std.store.addBlock('affine:note', props, ctx.store.root);
                         std.store.addBlock('affine:paragraph', {
                             text: new Text([
                                 {

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

@@ -33,7 +33,7 @@ var __runInitializers = (this && this.__runInitializers) || function (thisArg, i
     return useValue ? value : void 0;
 };
 import { toEdgelessEmbedBlock } from '../../affine-block-embed/index.js';
-import { EdgelessCRUDIdentifier, reassociateConnectorsCommand, } from '../../affine-block-surface/index.js';
+import { EdgelessCRUDIdentifier, reassociateConnectorsCommand, sourceLayerOf, } from '../../affine-block-surface/index.js';
 import {} from '../../affine-model/index.js';
 import { EMBED_CARD_HEIGHT, EMBED_CARD_WIDTH, } from '../../affine-shared/consts/index.js';
 import { ThemeExtensionIdentifier, ThemeProvider, translateKey, } from '../../affine-shared/services/index.js';
@@ -170,6 +170,8 @@ let EmbedEdgelessSyncedDocBlockComponent = (() => {
                     caption,
                     ...this.referenceInfo,
                     ...aliasInfo,
+                    // In the synced doc's layer, not the active one (ADR 0031 §6).
+                    layer: sourceLayerOf(this.model),
                 }, surface);
                 this.std.command.exec(reassociateConnectorsCommand, {
                     oldId: id,

package/dist/_pkgs/affine-block-frame/frame-manager.d.ts

@@ -20,6 +20,9 @@ export declare const EdgelessFrameManagerIdentifier: import("../global/di/types.
 export declare class EdgelessFrameManager extends GfxExtension {
     static key: string;
     private readonly _disposable;
+    /** Canvas elements added locally, waiting for the adoption microtask. */
+    private readonly _pendingAdoptions;
+    private _pendingAdoptionTicks;
     /**
      * Get all sorted frames by presentation orderer,
      * the legacy frame that uses `index` as presentation order
@@ -67,6 +70,8 @@ export declare class EdgelessFrameManager extends GfxExtension {
      */
     private _watchFrameMoved;
     private _watchElementAdded;
+    /** A canvas element just added locally: the frame under it adopts it. */
+    private _adoptIfInFrame;
     /**
      * Whether `element` fully encloses `frame`.
      *

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

@@ -1,4 +1,4 @@
-import { indexOverBackgrounds, Overlay, stackedElementsOf, } from '../affine-block-surface/index.js';
+import { applyCreationLayer, indexOverBackgrounds, Overlay, stackedElementsOf, } from '../affine-block-surface/index.js';
 import { FrameworkBackgroundElementModel } from '../affine-model/index.js';
 import { EditPropsStore, getChromeAccentColor, translateKey, } from '../affine-shared/services/index.js';
 import { DisposableGroup } from '../global/disposable/index.js';
@@ -103,6 +103,9 @@ export class EdgelessFrameManager extends GfxExtension {
     constructor(gfx) {
         super(gfx);
         this._disposable = new DisposableGroup();
+        /** Canvas elements added locally, waiting for the adoption microtask. */
+        this._pendingAdoptions = [];
+        this._pendingAdoptionTicks = 0;
         this._watchElementAdded();
         this._watchFrameMoved();
     }
@@ -158,6 +161,10 @@ export class EdgelessFrameManager extends GfxExtension {
             index: this.frameIndexAt(bound),
             presentationIndex: this.generatePresentationIndex(),
         });
+        // The viewer's active layer, like every new model (ADR 0031 §6). Not
+        // through the stamped CRUD `addBlock`: it would replace the index
+        // `frameIndexAt` just chose.
+        applyCreationLayer(this.gfx.std, props);
         const id = this.gfx.doc.addBlock('affine:frame', props, surfaceModel);
         const frameModel = this.gfx.getElementById(id);
         if (!frameModel || !isFrameBlock(frameModel)) {
@@ -231,7 +238,7 @@ export class EdgelessFrameManager extends GfxExtension {
         const { surface: surfaceModel, doc } = this.gfx;
         this._disposable.add(surfaceModel.elementAdded.subscribe(({ id, local }) => {
             const element = surfaceModel.getElementById(id);
-            if (element && local) {
+            if (element && local && !surfaceModel.store.readonly) {
                 // The entire frame detection logic must be in microtask for timing reasons:
                 //
                 // 1. For connectors: When elementAdded fires, connectors have invalid bounds [0,0,0,0]
@@ -248,22 +255,23 @@ export class EdgelessFrameManager extends GfxExtension {
                 // - Connectors have proper bounds calculated (not [0,0,0,0])
                 // - getFrameFromPoint() works correctly with valid element centers
                 // - All element initialization is complete before frame detection
+                //
+                // One transaction (one update for the peers) adopts everything a
+                // single transaction added — a paste of N elements no longer sends N
+                // adoptions. Only the LAST microtask queued does the work, so each
+                // element is decided no earlier than its own microtask would have
+                // been, connector paths included.
+                this._pendingAdoptions.push(element);
+                this._pendingAdoptionTicks++;
                 queueMicrotask(() => {
-                    const frame = this.getFrameFromPoint(element.elementBound.center);
-                    // if the container created with a frame, skip it.
-                    if (isGfxGroupCompatibleModel(element) &&
-                        frame &&
-                        element.hasChild(frame)) {
+                    if (--this._pendingAdoptionTicks > 0)
+                        return;
+                    const elements = this._pendingAdoptions.splice(0);
+                    if (surfaceModel.store.readonly)
                         return;
-                    }
-                    // Only add elements that aren't already grouped and have a valid
-                    // frame, and never let the frame swallow a backdrop that encloses
-                    // it (e.g. a Wardley map background the frame was drawn on top of).
-                    if (!element.group &&
-                        frame &&
-                        !this._enclosesFrame(element, frame)) {
-                        this._adoptNewlyCreatedElement(frame, element);
-                    }
+                    doc.transact(() => {
+                        elements.forEach(element => this._adoptIfInFrame(element));
+                    });
                 });
             }
         }));
@@ -275,11 +283,18 @@ export class EdgelessFrameManager extends GfxExtension {
             // 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)
+            if (!payload.isLocal || doc.readonly)
                 return;
             if (payload.type === 'add' &&
                 payload.model instanceof GfxBlockElementModel &&
                 renderableInEdgeless(doc, surfaceModel, payload.model)) {
+                // Same guard as the canvas half: a block that already has a parent
+                // (restored by undo with its group, or created by a transaction that
+                // also wrote its container) is not the frame's to take. Adopting it
+                // makes two containers claim one child, and the next duplicate
+                // copies that child twice.
+                if (payload.model.group)
+                    return;
                 const frame = this.getFrameFromPoint(payload.model.elementBound.center, isFrameBlock(payload.model) ? [payload.model] : []);
                 if (!frame)
                     return;
@@ -297,6 +312,22 @@ export class EdgelessFrameManager extends GfxExtension {
             }
         }));
     }
+    /** A canvas element just added locally: the frame under it adopts it. */
+    _adoptIfInFrame(element) {
+        const frame = this.getFrameFromPoint(element.elementBound.center);
+        if (!frame)
+            return;
+        // if the container created with a frame, skip it.
+        if (isGfxGroupCompatibleModel(element) && element.hasChild(frame)) {
+            return;
+        }
+        // Only add elements that aren't already grouped, and never let the frame
+        // swallow a backdrop that encloses it (e.g. a Wardley map background the
+        // frame was drawn on top of).
+        if (!element.group && !this._enclosesFrame(element, frame)) {
+            this._adoptNewlyCreatedElement(frame, element);
+        }
+    }
     /**
      * Whether `element` fully encloses `frame`.
      *

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

@@ -1,4 +1,4 @@
-import { DefaultTool, OverlayIdentifier } from '../affine-block-surface/index.js';
+import { applyCreationLayer, DefaultTool, OverlayIdentifier, } from '../affine-block-surface/index.js';
 import { EditPropsStore, TelemetryProvider, translateKey, } from '../affine-shared/services/index.js';
 import { Bound, Vec } from '../global/gfx/index.js';
 import { BaseTool, getTopElements } from '../std/gfx/index.js';
@@ -61,6 +61,8 @@ export class FrameTool extends BaseTool {
                 index: this.frameManager.frameIndexAt(bound),
                 presentationIndex: this.frameManager.generatePresentationIndex(),
             });
+            // The active layer, as `EdgelessFrameManager._addFrameBlock` does.
+            applyCreationLayer(this.std, props);
             const id = this.doc.addBlock('affine:frame', props, this.gfx.surface);
             this.std.getOptional(TelemetryProvider)?.track('CanvasElementAdded', {
                 control: 'canvas:draw',

package/dist/_pkgs/affine-block-image/utils.js

@@ -1,4 +1,4 @@
-import { autoResizeElementsCommand } from '../affine-block-surface/index.js';
+import { applyCreationLayer, autoResizeElementsCommand, } from '../affine-block-surface/index.js';
 import { toast } from '../affine-components/toast/index.js';
 import { ImageBlockSchema, } from '../affine-model/index.js';
 import { FileSizeLimitProvider, NativeClipboardProvider, TOAST_DOWNLOAD_IN_PROGRESS, TOAST_UPLOAD_SIZE_LIMIT, translateKey, } from '../affine-shared/services/index.js';
@@ -234,6 +234,9 @@ export async function addImages(std, files, options) {
             },
         };
     });
+    // The viewer's active layer, as the CRUD `addBlock` path stamps it
+    // (ADR 0031 §6): several blocks at once go straight to `store.addBlocks`.
+    blocks.forEach(({ blockProps }) => applyCreationLayer(std, blockProps));
     const blockIds = std.store.addBlocks(blocks, gfx.surface);
     gfx.selection.set({
         elements: blockIds,

package/dist/_pkgs/affine-block-latex/adapters/markdown/preprocessor.d.ts

@@ -1,4 +1,12 @@
 import { type MarkdownAdapterPreprocessor } from '../../../affine-shared/adapters/index.js';
+/**
+ * Preprocess the content to protect code blocks and LaTeX expressions
+ * reference issue: https://github.com/remarkjs/react-markdown/issues/785
+ * reference comment: https://github.com/remarkjs/react-markdown/issues/785#issuecomment-2307567823
+ * @param content - The content to preprocess
+ * @returns The preprocessed content
+ */
+export declare function preprocessLatex(content: string): string;
 export declare const LatexMarkdownPreprocessorExtension: import("../../../store/index.js").ExtensionType & {
     identifier: import("../../../global/di/types.js").ServiceIdentifier<MarkdownAdapterPreprocessor>;
 };

package/dist/_pkgs/affine-block-latex/adapters/markdown/preprocessor.js

@@ -24,7 +24,7 @@ function escapeMhchem(text) {
  * @param content - The content to preprocess
  * @returns The preprocessed content
  */
-function preprocessLatex(content) {
+export function preprocessLatex(content) {
     // Protect code blocks
     const codeBlocks = [];
     let preprocessedContent = content;
@@ -32,14 +32,18 @@ function preprocessLatex(content) {
         codeBlocks.push(code);
         return `<<CODE_BLOCK_${codeBlocks.length - 1}>>`;
     });
-    // Protect existing LaTeX expressions
+    // Protect existing LaTeX expressions. Inline delimiters use Pandoc's
+    // whitespace and digit rules, with backslash parity preserved: a `$` opens
+    // math when not followed by a space, closes it when not preceded by one nor
+    // followed by a digit, and an odd backslash run escapes it.
     const latexExpressions = [];
-    preprocessedContent = preprocessedContent.replace(/(\$\$[\s\S]*?\$\$|\\\[[\s\S]*?\\\]|\\\(.*?\\\))/g, match => {
+    preprocessedContent = preprocessedContent.replace(/(\$\$[\s\S]*?\$\$|\\\[[\s\S]*?\\\]|\\\(.*?\\\)|(?<!\\)(?:\\\\)*\$(?!\s)(?:[^\n$\\]|\\.)*?(?<!\s)\$(?!\d))/g, match => {
         latexExpressions.push(match);
         return `<<LATEX_${latexExpressions.length - 1}>>`;
     });
-    // Escape dollar signs that are likely currency indicators
-    preprocessedContent = preprocessedContent.replace(/\$(?=\d)/g, '\\$');
+    // Escape dollar signs that are likely currency indicators. An odd backslash
+    // run already escapes the dollar sign, so only an even run (or none) gets one.
+    preprocessedContent = preprocessedContent.replace(/(?<!\\)((?:\\\\)*)\$(?=\d)/g, '$1\\$');
     // Restore LaTeX expressions
     preprocessedContent = preprocessedContent.replace(/<<LATEX_(\d+)>>/g, (_, index) => latexExpressions[parseInt(index)]);
     // Restore code blocks

package/dist/_pkgs/affine-block-note/translations.d.ts

@@ -57,7 +57,6 @@ export declare const NOTE_BORDER_STYLE_LABEL: ChromeWording;
 /** An alias (L7 dedupe): the same word as {@link DISPLAY_MODE_SHOW_IN}, one key. */
 export declare const NOTE_DISPLAY_MODE_SHOW_IN: ChromeWording;
 export declare const NOTE_DISPLAY_MODE_LABEL: ChromeWording;
-export declare const NOTE_DISPLAY_MODE_TOOLTIP: ChromeWording;
 /** An alias (L7 dedupe): the same word as {@link DISPLAY_MODE_BOTH}, one key. */
 export declare const NOTE_DISPLAY_MODE_BOTH: ChromeWording;
 /** An alias (L7 dedupe): the same word as {@link DISPLAY_MODE_EDGELESS}, one key. */

package/dist/_pkgs/affine-block-note/translations.js

@@ -143,10 +143,6 @@ export const NOTE_DISPLAY_MODE_LABEL = [
     'com.labre.note.display-mode.mode-label',
     'Mode',
 ];
-export const NOTE_DISPLAY_MODE_TOOLTIP = [
-    'com.labre.note.display-mode.tooltip',
-    'Display mode',
-];
 /** An alias (L7 dedupe): the same word as {@link DISPLAY_MODE_BOTH}, one key. */
 export const NOTE_DISPLAY_MODE_BOTH = DISPLAY_MODE_BOTH;
 /** An alias (L7 dedupe): the same word as {@link DISPLAY_MODE_EDGELESS}, one key. */
@@ -237,7 +233,6 @@ export const NOTE_WORDINGS = [
     NOTE_STYLE_CUSTOM_COLOR,
     NOTE_STYLE_PANEL_LABEL,
     NOTE_DISPLAY_MODE_LABEL,
-    NOTE_DISPLAY_MODE_TOOLTIP,
     NOTE_TOAST_DISPLAYED_IN_PAGE_MODE,
     NOTE_TOAST_REMOVED_FROM_PAGE_BODY,
     NOTE_TOAST_ADDED_TO_PAGE_BODY,

package/dist/_pkgs/affine-block-root/configs/toolbar.js

@@ -5,7 +5,7 @@ import { toast } from '../../affine-components/toast/index.js';
 import { EditorChevronDown } from '../../affine-components/toolbar/index.js';
 import { deleteTextCommand, formatBlockCommand, formatNativeCommand, formatTextCommand, isFormatSupported, textFormatConfigs, } from '../../affine-inline-preset/index.js';
 import { EmbedLinkedDocBlockSchema, EmbedSyncedDocBlockSchema, } from '../../affine-model/index.js';
-import { textConversionConfigs } from '../../affine-rich-text/index.js';
+import { textConversionConfigs, TextConversionEntryIdentifier, } from '../../affine-rich-text/index.js';
 import { copySelectedModelsCommand, deleteSelectedModelsCommand, draftSelectedModelsCommand, duplicateSelectedModelsCommand, getBlockSelectionsCommand, getImageSelectionsCommand, getSelectedBlocksCommand, getSelectedModelsCommand, getTextSelectionCommand, } from '../../affine-shared/commands/index.js';
 import { ActionPlacement, blockCommentToolbarButton, TOAST_COPIED_TO_CLIPBOARD, TOOLBAR_COPY, TOOLBAR_DELETE, TOOLBAR_DUPLICATE, translateKey, } from '../../affine-shared/services/index.js';
 import { tableViewMeta } from '../../data-view/view-presets/index.js';
@@ -42,6 +42,11 @@ const conversionsActionGroup = {
             })
                 .run();
         };
+        // Conversions a gated block package registers from its own view extension
+        // (#418): absent when its flag is off, so never listed statically here.
+        const contributed = [
+            ...std.provider.getAll(TextConversionEntryIdentifier).values(),
+        ].filter(entry => entry.when(std, selectedModels));
         return {
             content: html `
         <editor-menu-button
@@ -65,6 +70,17 @@ const conversionsActionGroup = {
                   ${icon}<span class="label">${name}</span>
                 </editor-menu-action>
               `)}
+            ${repeat(contributed, entry => entry.flavour, entry => {
+                const label = translateKey(std, ...entry.nameWording);
+                return html `
+                  <editor-menu-action
+                    aria-label=${label}
+                    @click=${() => entry.run(std, selectedModels)}
+                  >
+                    ${entry.icon}<span class="label">${label}</span>
+                  </editor-menu-action>
+                `;
+            })}
           </div>
         </editor-menu-button>
       `,

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

@@ -7,7 +7,7 @@ import { BookmarkStyles, DEFAULT_NOTE_HEIGHT, DEFAULT_NOTE_WIDTH, FrameBlockMode
 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';
+import { convertToPng, isInsidePageEditor, isTopLevelBlock, isUrlInClipboard, matchModels, normalizeCanvasExportColors, referenceToNode, } from '../../../affine-shared/utils/index.js';
 import { DisposableGroup } from '../../../global/disposable/index.js';
 import { BlockSuiteError, ErrorCode } from '../../../global/exceptions/index.js';
 import { Bound, getCommonBound, Vec, } from '../../../global/gfx/index.js';
@@ -336,6 +336,7 @@ export class EdgelessClipboardController extends PageClipboard {
                 }
             },
             onclone: async function (documentClone, element) {
+                normalizeCanvasExportColors(documentClone, element);
                 // html2canvas can't support transform feature
                 element.style.setProperty('transform', 'none');
                 const layer = documentClone.querySelector('.affine-edgeless-layer');