@formicoidea/labre-core 0.53.0 → 0.54.0

package/dist/_pkgs/affine-inline-reference/reference-node/reference-popup/reference-popup.js

@@ -137,7 +137,7 @@ let ReferencePopup = (() => {
       box-sizing: border-box;
     }
 
-    .overlay-mask {
+    reference-popup .overlay-mask {
       position: fixed;
       z-index: var(--affine-z-index-popover);
       top: 0;
@@ -146,8 +146,8 @@ let ReferencePopup = (() => {
       height: 100vh;
     }
 
-    ${panelBaseStyle('.popover-container')}
-    .popover-container {
+    ${panelBaseStyle('reference-popup .popover-container')}
+    reference-popup .popover-container {
       position: absolute;
       display: flex;
       gap: 8px;
@@ -169,7 +169,7 @@ let ReferencePopup = (() => {
       }
     }
 
-    input {
+    reference-popup input {
       display: flex;
       flex: 1;
       padding: 0;
@@ -177,16 +177,16 @@ let ReferencePopup = (() => {
       background: transparent;
       color: var(--affine-text-primary-color);
     }
-    ${fontXSStyle('input')}
-    input::placeholder {
+    ${fontXSStyle('reference-popup input')}
+    reference-popup input::placeholder {
       color: var(--affine-placeholder-color);
     }
-    input:focus {
+    reference-popup input:focus {
       outline: none;
     }
 
-    ${fontXSStyle('editor-icon-button.save .label')}
-    editor-icon-button.save .label {
+    ${fontXSStyle('reference-popup editor-icon-button.save .label')}
+    reference-popup editor-icon-button.save .label {
       color: inherit;
       text-transform: none;
     }

package/dist/_pkgs/affine-shared/consts/notation.d.ts

@@ -64,4 +64,5 @@ declare const SCALE: {
  */
 export declare const NOTATION_NEUTRALS: Readonly<typeof SCALE>;
 export type NotationNeutral = keyof typeof NOTATION_NEUTRALS;
+export declare const NOTATION_NEUTRALS_DARK: Readonly<Record<NotationNeutral, string>>;
 export {};

package/dist/_pkgs/affine-shared/consts/notation.js

@@ -63,3 +63,32 @@ const SCALE = {
  * colour is (a helper whose parameter type is inferred from a default).
  */
 export const NOTATION_NEUTRALS = Object.freeze(SCALE);
+/**
+ * The same scale on the dark canvas, key for key (ADR 0039). A canvas in the
+ * dark scheme does not show a white card with a near-black ink: the PAPER
+ * inverts and the hues stay. These values are what a notation element is
+ * painted with at render time when the canvas is dark; nothing is written to a
+ * document, and the SVG export keeps the light scale.
+ *
+ * Read off the dark chrome the editor already paints (`@toeverything/theme`,
+ * AFFiNE's dark tables): the card is the dark page itself (`rgb(20, 20, 20)`,
+ * `--affine-background-primary-color`), exactly as the light card is the white
+ * page, so a board is told apart by its border in both schemes; the ink is the
+ * dark primary text (`rgb(234, 234, 234)`) and the label the dark secondary
+ * text (`rgb(156, 156, 160)`). Every other step keeps the contrast its light
+ * twin has on white, within a hair (`notation-dark-scale.unit.spec.ts`).
+ *
+ * The card being the page is also what keeps a dark accent around 3:1 under a
+ * selection (labre ADR-0049, question 2): anything lighter than the page
+ * beneath a selection frame lowers it.
+ */
+const DARK_SCALE = {
+    ink: '#eaeaea',
+    frameInk: '#c4c5c9',
+    label: '#9c9ca0',
+    divider: '#5f6166',
+    cardFill: '#141414',
+    cardBorder: '#3a3a3c',
+    legendBorder: '#4b4d52',
+};
+export const NOTATION_NEUTRALS_DARK = Object.freeze(DARK_SCALE);

package/dist/_pkgs/affine-shared/services/frame-template-service.d.ts

@@ -61,6 +61,10 @@ export interface FrameTemplateFrameRef {
  *   your id for the template: link what the copy references (its images) to
  *   that document. Not called when the insertion failed.
  *
+ * - `showTemplates` (since 0.54) is called by the « View » action of the
+ *   notification that says a save succeeded: open the place where the viewer
+ *   finds the saved template. Absent, that notification has no action.
+ *
  * Both notifications may come twice for one gesture (two editors mounted on
  * one document): make them idempotent.
  */
@@ -70,6 +74,7 @@ export interface FrameTemplateService {
     frameDeleted?(frame: FrameTemplateFrameRef): void;
     frameRestored?(frame: FrameTemplateFrameRef): void;
     frameInserted?(insertion: FrameTemplateInsertion): void;
+    showTemplates?(): void;
 }
 export declare const FrameTemplateProvider: import("../../global/di/types.js").ServiceIdentifier<FrameTemplateService> & (<U extends FrameTemplateService = FrameTemplateService>(variant: import("../../global/di/types.js").ServiceVariant) => import("../../global/di/types.js").ServiceIdentifier<U>);
 /**

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

@@ -29,6 +29,7 @@ export * from './native-clipboard-service.js';
 export * from './notification-service.js';
 export * from './open-doc-config.js';
 export * from './outline-panel-service.js';
+export * from './page-drop-service.js';
 export * from './page-viewport-service.js';
 export * from './parse-url-service.js';
 export * from './pivot-materiality-publisher.js';

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

@@ -29,6 +29,7 @@ export * from './native-clipboard-service.js';
 export * from './notification-service.js';
 export * from './open-doc-config.js';
 export * from './outline-panel-service.js';
+export * from './page-drop-service.js';
 export * from './page-viewport-service.js';
 export * from './parse-url-service.js';
 export * from './pivot-materiality-publisher.js';

package/dist/_pkgs/affine-shared/services/page-drop-service.d.ts

@@ -0,0 +1,61 @@
+import type { BlockStdScope } from '../../std/index.js';
+import type { ExtensionType } from '../../store/index.js';
+/**
+ * What the host says about a native drag over an editor (dragover).
+ *
+ * - `'ignore'`: not one of the host's pages; the editor treats it as before.
+ * - `'refuse'`: one of the host's pages that may not land in this document;
+ *   the browser shows its no-drop cursor and no drop line is drawn.
+ * - `'accept'`: the drop line is drawn and the drop calls `drop`.
+ */
+export type PageDropVerdict = 'ignore' | 'refuse' | 'accept';
+/** The page a drop placed, and how to undo what the host did for it. */
+export interface PageDrop {
+    /** The page whose `affine:embed-linked-doc` card goes where it was dropped. */
+    pageId: string;
+    /**
+     * Called when the undo step that holds the card is undone (Mod+Z, the
+     * history), after the card is gone: put back what `drop` changed.
+     */
+    undo?: () => void;
+    /** Called when that step is redone, after the card is back. */
+    redo?: () => void;
+}
+/**
+ * Pages dragged from the host's own chrome (a sidebar tree) into the editor
+ * (labre P7, ADR-0045 §7 amended 2026-10-16): the host recognises its drag
+ * and decides what the drop means; the editor draws the drop line and places
+ * a card of the page where it was dropped (the drop line in a note, the drop
+ * point on the canvas), in one undo step that also carries the host's
+ * `undo` / `redo`.
+ *
+ * - `verdict` is called on every dragover. The browser exposes only
+ *   `dataTransfer.types` then, never the data: the host knows which page it is
+ *   dragging from its own state. A read-only document refuses whatever the
+ *   host says.
+ * - `drop` is called once, synchronously, for a drop the last `verdict`
+ *   accepted. Return `null` to place nothing (the host changed its mind).
+ *   The editor never copies or creates a page: the card references `pageId`.
+ */
+export interface PageDropService {
+    verdict(drag: {
+        types: readonly string[];
+        docId: string;
+    }): PageDropVerdict;
+    drop(drag: {
+        dataTransfer: DataTransfer;
+        docId: string;
+    }): PageDrop | null;
+}
+export declare const PageDropProvider: import("../../global/di/types.js").ServiceIdentifier<PageDropService> & (<U extends PageDropService = PageDropService>(variant: import("../../global/di/types.js").ServiceVariant) => import("../../global/di/types.js").ServiceIdentifier<U>);
+/**
+ * Host seam: accept pages dragged from the host into the editor. Absent, such
+ * a drag is any other foreign drag: the page view draws its drop line and the
+ * drop does nothing.
+ *
+ * `di.override`, like `FrameTemplateExtension`, so a later registration wins
+ * and registering twice never throws at boot.
+ */
+export declare function PageDropExtension(service: PageDropService): ExtensionType;
+/** The verdict for a native drag over `std`'s editor, read-only included. */
+export declare function pageDropVerdict(std: Pick<BlockStdScope, 'getOptional' | 'store'>, dataTransfer: DataTransfer | null): PageDropVerdict;

package/dist/_pkgs/affine-shared/services/page-drop-service.js

@@ -0,0 +1,30 @@
+import { createIdentifier } from '../../global/di/index.js';
+export const PageDropProvider = createIdentifier('AffinePageDrop');
+/**
+ * Host seam: accept pages dragged from the host into the editor. Absent, such
+ * a drag is any other foreign drag: the page view draws its drop line and the
+ * drop does nothing.
+ *
+ * `di.override`, like `FrameTemplateExtension`, so a later registration wins
+ * and registering twice never throws at boot.
+ */
+export function PageDropExtension(service) {
+    return {
+        setup: di => {
+            di.override(PageDropProvider, () => service);
+        },
+    };
+}
+/** The verdict for a native drag over `std`'s editor, read-only included. */
+export function pageDropVerdict(std, dataTransfer) {
+    const service = std.getOptional(PageDropProvider);
+    if (!service || !dataTransfer)
+        return 'ignore';
+    const verdict = service.verdict({
+        types: [...dataTransfer.types],
+        docId: std.store.id,
+    });
+    if (verdict === 'ignore')
+        return 'ignore';
+    return std.store.readonly ? 'refuse' : verdict;
+}

package/dist/_pkgs/affine-shared/styles/scrollbar-style.js

@@ -23,7 +23,7 @@ export const scrollbarStyle = (container) => {
     }
     ${unsafeCSS(container)}::-webkit-scrollbar-thumb {
       border-radius: 2px;
-      background-color: #b1b1b1;
+      background-color: var(--affine-text-disable-color);
     }
     ${unsafeCSS(container)}::-webkit-scrollbar-corner {
       display: none;

package/dist/_pkgs/affine-widget-edgeless-auto-connect/index.js

@@ -157,7 +157,7 @@ let EdgelessAutoConnectWidget = (() => {
     .page-visible-index-label {
       box-sizing: border-box;
       padding: 0px 6px;
-      border: 1px solid #0000001a;
+      border: 1px solid var(--affine-black-10);
 
       width: fit-content;
       height: 24px;
@@ -179,9 +179,9 @@ let EdgelessAutoConnectWidget = (() => {
       width: 48px;
       padding: 4px;
       border-radius: 58px;
-      border: 1px solid rgba(227, 226, 228, 1);
+      border: 1px solid var(--affine-border-color);
       transition: opacity 0.5s ease-in-out;
-      background: rgba(251, 251, 252, 1);
+      background: var(--affine-background-overlay-panel-color);
       display: flex;
       align-items: center;
       justify-content: space-between;
@@ -197,7 +197,7 @@ let EdgelessAutoConnectWidget = (() => {
     .navigator span {
       display: inline-block;
       height: 8px;
-      border: 1px solid rgba(227, 226, 228, 1);
+      border: 1px solid var(--affine-border-color);
     }
 
     .navigator div:hover {
@@ -357,7 +357,7 @@ let EdgelessAutoConnectWidget = (() => {
             const iconStyle = {
                 width: '16px',
                 height: '16px',
-                style: 'color:#77757D;',
+                style: 'color:var(--affine-icon-color);',
             };
             return html `<div class=${className} style=${navigatorStyle}>
       <div

package/dist/_pkgs/affine-widget-edgeless-selected-rect/edgeless-auto-complete.js

@@ -180,8 +180,8 @@ let EdgelessAutoComplete = (() => {
     }
 
     .edgeless-auto-complete-arrow svg {
-      fill: #77757d;
-      color: #77757d;
+      fill: var(--affine-icon-color);
+      color: var(--affine-icon-color);
     }
     .edgeless-auto-complete-arrow:hover svg {
       fill: #ffffff;

package/dist/_pkgs/affine-widget-keyboard-toolbar/config.js

@@ -563,7 +563,7 @@ const textStyleToolItems = [
         icon: BoldIcon(),
         background: ({ std }) => {
             const [_, { textAttributes }] = std.command.exec(getTextAttributes);
-            return textAttributes?.bold ? '#00000012' : '';
+            return textAttributes?.bold ? 'var(--affine-hover-color)' : '';
         },
         action: ({ std }) => {
             std.command.exec(toggleBold);
@@ -574,7 +574,7 @@ const textStyleToolItems = [
         icon: ItalicIcon(),
         background: ({ std }) => {
             const [_, { textAttributes }] = std.command.exec(getTextAttributes);
-            return textAttributes?.italic ? '#00000012' : '';
+            return textAttributes?.italic ? 'var(--affine-hover-color)' : '';
         },
         action: ({ std }) => {
             std.command.exec(toggleItalic);
@@ -585,7 +585,7 @@ const textStyleToolItems = [
         icon: UnderLineIcon(),
         background: ({ std }) => {
             const [_, { textAttributes }] = std.command.exec(getTextAttributes);
-            return textAttributes?.underline ? '#00000012' : '';
+            return textAttributes?.underline ? 'var(--affine-hover-color)' : '';
         },
         action: ({ std }) => {
             std.command.exec(toggleUnderline);
@@ -596,7 +596,7 @@ const textStyleToolItems = [
         icon: StrikeThroughIcon(),
         background: ({ std }) => {
             const [_, { textAttributes }] = std.command.exec(getTextAttributes);
-            return textAttributes?.strike ? '#00000012' : '';
+            return textAttributes?.strike ? 'var(--affine-hover-color)' : '';
         },
         action: ({ std }) => {
             std.command.exec(toggleStrike);
@@ -607,7 +607,7 @@ const textStyleToolItems = [
         icon: CodeIcon(),
         background: ({ std }) => {
             const [_, { textAttributes }] = std.command.exec(getTextAttributes);
-            return textAttributes?.code ? '#00000012' : '';
+            return textAttributes?.code ? 'var(--affine-hover-color)' : '';
         },
         action: ({ std }) => {
             std.command.exec(toggleCode);
@@ -618,7 +618,7 @@ const textStyleToolItems = [
         icon: LinkIcon(),
         background: ({ std }) => {
             const [_, { textAttributes }] = std.command.exec(getTextAttributes);
-            return textAttributes?.link ? '#00000012' : '';
+            return textAttributes?.link ? 'var(--affine-hover-color)' : '';
         },
         action: ({ std }) => {
             std.command.exec(toggleLink);

package/dist/_pkgs/affine-widget-keyboard-toolbar/styles.js

@@ -119,7 +119,7 @@ export const keyboardToolPanelStyles = css `
     }
 
     button:active {
-      background: #00000012;
+      background: var(--affine-hover-color);
     }
 
     button svg {

package/dist/_pkgs/affine-widget-linked-doc/config.d.ts

@@ -44,6 +44,14 @@ export declare function createLinkedDocMenuGroup(query: string, abort: () => voi
     overflowText: string;
 };
 export declare function createNewDocMenuGroup(query: string, abort: () => void, editorHost: EditorHost, inlineEditor: AffineInlineEditor): LinkedMenuGroup;
+/**
+ * The default `@` menu REFERENCES a page that exists; it creates nothing.
+ * Creating a page is the slash menu's job ("New Page", which goes through
+ * `LinkedDocCreationProvider`), so the two gestures never overlap: `@` points,
+ * `/` makes (PO, 2026-10-14). The creation group is still exported through
+ * {@link LinkedWidgetUtils} for a host that wants it back in its own
+ * `getMenus`.
+ */
 export declare function getMenus(query: string, abort: () => void, editorHost: EditorHost, inlineEditor: AffineInlineEditor): Promise<LinkedMenuGroup[]>;
 export declare const LinkedWidgetUtils: {
     createNewDocMenuGroup: typeof createNewDocMenuGroup;

package/dist/_pkgs/affine-widget-linked-doc/config.js

@@ -120,10 +120,17 @@ export function createNewDocMenuGroup(query, abort, editorHost, inlineEditor) {
         items,
     };
 }
+/**
+ * The default `@` menu REFERENCES a page that exists; it creates nothing.
+ * Creating a page is the slash menu's job ("New Page", which goes through
+ * `LinkedDocCreationProvider`), so the two gestures never overlap: `@` points,
+ * `/` makes (PO, 2026-10-14). The creation group is still exported through
+ * {@link LinkedWidgetUtils} for a host that wants it back in its own
+ * `getMenus`.
+ */
 export function getMenus(query, abort, editorHost, inlineEditor) {
     return Promise.resolve([
         createLinkedDocMenuGroup(query, abort, editorHost, inlineEditor),
-        createNewDocMenuGroup(query, abort, editorHost, inlineEditor),
     ]);
 }
 export const LinkedWidgetUtils = {

package/dist/_pkgs/affine-widget-linked-doc/linked-doc-popover.js

@@ -47,7 +47,7 @@ import { property, query, queryAll, state } from 'lit/decorators.js';
 import { styleMap } from 'lit/directives/style-map.js';
 import throttle from 'lodash-es/throttle.js';
 import { linkedDocPopoverStyles } from './styles.js';
-import { LINKED_DOC_OVERFLOW_MORE } from './translations.js';
+import { LINKED_DOC_NO_RESULT, LINKED_DOC_OVERFLOW_MORE, } from './translations.js';
 import { createLinkedDocKeydownInterceptor, resolveSignal } from './utils.js';
 let LinkedDocPopover = (() => {
     let _classDecorators = [requiredProperties({
@@ -239,46 +239,54 @@ let LinkedDocPopover = (() => {
                     isHidden,
                 };
             });
+            const shown = actionGroups.filter(group => (group.items.length > 0 || group.isLoading) && !group.isHidden);
+            // An empty box reads as a broken menu: since "@" only references
+            // existing pages, "no match" is an ordinary outcome and says so.
             return html `<div class="linked-doc-popover" style="${style}">
-      ${actionGroups
-                .filter(group => (group.items.length > 0 || group.isLoading) && !group.isHidden)
-                .map((group, idx) => {
+      ${shown.length === 0
+                ? html `<div class="group-title" data-testid="linked-doc-no-result">
+            <div class="group-title-text">
+              ${translateKey(this.context.std, ...LINKED_DOC_NO_RESULT)}
+            </div>
+          </div>`
+                : nothing}
+      ${shown.map((group, idx) => {
                 return html `
-            <div class="divider" ?hidden=${idx === 0}></div>
-            <div class="group-title">
-              <div class="group-title-text">${group.name}</div>
-              ${group.isLoading
+          <div class="divider" ?hidden=${idx === 0}></div>
+          <div class="group-title">
+            <div class="group-title-text">${group.name}</div>
+            ${group.isLoading
                     ? html `<span class="loading-icon">${LoadingIcon()}</span>`
                     : nothing}
-            </div>
-            <div class="group" style=${group.styles ?? ''}>
-              ${group.items.map(({ key, name, icon, action }) => {
+          </div>
+          <div class="group" style=${group.styles ?? ''}>
+            ${group.items.map(({ key, name, icon, action }) => {
                     const tooltip = this._showTooltip
                         ? html `<affine-tooltip
-                      tip-position=${'right'}
-                      .tooltipStyle=${css `
-                        * {
-                          color: ${unsafeCSSVar('white')} !important;
-                        }
-                      `}
-                      >${name}</affine-tooltip
-                    >`
+                    tip-position=${'right'}
+                    .tooltipStyle=${css `
+                      * {
+                        color: ${unsafeCSSVar('white')} !important;
+                      }
+                    `}
+                    >${name}</affine-tooltip
+                  >`
                         : nothing;
                     return html `<icon-button
-                  width="260px"
-                  height="30px"
-                  data-id=${key}
-                  .text=${name}
-                  hover=${this._activatedItemKey === key}
-                  @pointerdown=${(e) => {
+                width="260px"
+                height="30px"
+                data-id=${key}
+                .text=${name}
+                hover=${this._activatedItemKey === key}
+                @pointerdown=${(e) => {
                         // Prevent event listeners being registered on the root document
                         // eg., radix-ui dialogs usePointerDownOutside hooks
                         e.stopPropagation();
                     }}
-                  @click=${() => {
+                @click=${() => {
                         action()?.catch(console.error);
                     }}
-                  @mousemove=${() => {
+                @mousemove=${() => {
                         // Use `mousemove` instead of `mouseover` to avoid navigate conflict with keyboard
                         this._activatedItemKey = key;
                         // show tooltip whether text length overflows
@@ -290,12 +298,12 @@ let LinkedDocPopover = (() => {
                             }
                         }
                     }}
-                >
-                  ${icon} ${tooltip}
-                </icon-button>`;
+              >
+                ${icon} ${tooltip}
+              </icon-button>`;
                 })}
-            </div>
-          `;
+          </div>
+        `;
             })}
     </div>`;
         }

package/dist/_pkgs/affine-widget-linked-doc/styles.js

@@ -6,7 +6,7 @@ export const linkedDocWidgetStyles = css `
   .input-mask {
     position: absolute;
     pointer-events: none;
-    background: rgba(0, 0, 0, 0.1);
+    background: var(--affine-black-10);
     border-radius: 4px;
   }
 `;

package/dist/_pkgs/affine-widget-linked-doc/translations.d.ts

@@ -18,6 +18,8 @@ export declare const LINKED_DOC_NEW_DOC: ChromeWording;
  * word, in the same package.
  */
 export declare const LINKED_DOC_IMPORT: ChromeWording;
+/** Said when no page matches the query, instead of an empty popover. */
+export declare const LINKED_DOC_NO_RESULT: ChromeWording;
 /** The "Create doc" item's own wording, interpolated with the truncated name. */
 export declare const LINKED_DOC_CREATE_DOC: ChromeWording;
 /**

package/dist/_pkgs/affine-widget-linked-doc/translations.js

@@ -25,6 +25,11 @@ export const LINKED_DOC_IMPORT = [
     'com.labre.linked-doc.import',
     'Import',
 ];
+/** Said when no page matches the query, instead of an empty popover. */
+export const LINKED_DOC_NO_RESULT = [
+    'com.labre.linked-doc.no-result',
+    'No page found',
+];
 /** The "Create doc" item's own wording, interpolated with the truncated name. */
 export const LINKED_DOC_CREATE_DOC = [
     'com.labre.linked-doc.create-doc',
@@ -92,6 +97,7 @@ export const LINKED_DOC_WORDINGS = [
     LINKED_DOC_LINK_TO_DOC,
     LINKED_DOC_IMPORT,
     LINKED_DOC_CREATE_DOC,
+    LINKED_DOC_NO_RESULT,
     LINKED_DOC_IMPORT_SUCCESS_TOAST,
     LINKED_DOC_OVERFLOW_MORE,
     LINKED_DOC_IMPORT_NOTION_MARKDOWN_DEPRECATED,

package/dist/_pkgs/affine-widget-thread-marks/widget.d.ts

@@ -26,7 +26,9 @@ export declare function hitsThreadRange(rects: readonly SelectionRect[], x: numb
  * - a target `locate` cannot find (deleted, of the other view, hidden for this
  *   viewer) is skipped, never an error: an orphan anchor has no mark;
  * - a mark at `count <= 0` is not drawn;
- * - two marks on one target are one mark: counts add up, unread wins.
+ * - two marks on one target are one mark: counts add up, unread wins, and
+ *   the run of text it opens is kept only when every merged mark names the
+ *   same one (a mark that stands for several discussions opens the block).
  */
 export declare function placeThreadMarks(marks: readonly ThreadMark[], locate: (mark: ThreadMark) => ThreadMarkPlace | null): PlacedThreadMark[];
 /**

package/dist/_pkgs/affine-widget-thread-marks/widget.js

@@ -21,6 +21,7 @@ export function hitsThreadRange(rects, x, y) {
         y >= rect.top &&
         y <= rect.top + rect.height);
 }
+const sameRange = (a, b) => a?.start === b?.start && a?.end === b?.end;
 /**
  * The marks to draw, from what the host says and where the editor finds each
  * target. Pure, so the "ignore what is absent" rule is held by a test:
@@ -28,7 +29,9 @@ export function hitsThreadRange(rects, x, y) {
  * - a target `locate` cannot find (deleted, of the other view, hidden for this
  *   viewer) is skipped, never an error: an orphan anchor has no mark;
  * - a mark at `count <= 0` is not drawn;
- * - two marks on one target are one mark: counts add up, unread wins.
+ * - two marks on one target are one mark: counts add up, unread wins, and
+ *   the run of text it opens is kept only when every merged mark names the
+ *   same one (a mark that stands for several discussions opens the block).
  */
 export function placeThreadMarks(marks, locate) {
     const merged = new Map();
@@ -42,6 +45,7 @@ export function placeThreadMarks(marks, locate) {
                 ...seen,
                 count: seen.count + mark.count,
                 unread: seen.unread || mark.unread,
+                range: sameRange(seen.range, mark.range) ? seen.range : undefined,
             }
             : mark);
     }
@@ -317,6 +321,7 @@ export class ThreadMarksWidget extends WidgetComponent {
             openThreadOn(this.std, {
                 targetType: mark.targetType,
                 targetId: mark.targetId,
+                range: mark.range,
             });
         }}
           >${CommentIcon({ width: '16px', height: '16px' })}</icon-button

package/dist/_pkgs/affine-widget-toolbar/utils.d.ts

@@ -1,5 +1,5 @@
 import { type EditorToolbar } from '../affine-components/toolbar/index.js';
-import { ActionPlacement, type ToolbarActions, type ToolbarContext, type ToolbarLayoutStep, type ToolbarPlacement } from '../affine-shared/services/index.js';
+import { ActionPlacement, type ToolbarAction, type ToolbarActions, type ToolbarContext, type ToolbarLayoutStep, type ToolbarPlacement } from '../affine-shared/services/index.js';
 import type { AutoUpdateOptions, ReferenceElement, SideObject } from '@floating-ui/dom';
 export declare const sideMap: Map<string, {
     top: number;
@@ -33,6 +33,7 @@ export declare function combine(actions: ToolbarActions, context: ToolbarContext
     content?: ((cx: ToolbarContext) => import("lit-html").TemplateResult | null) | (import("lit-html").TemplateResult | null);
     run?: (cx: ToolbarContext) => void;
 }[];
+export declare function group(actions: ToolbarAction[]): ToolbarAction[];
 /**
  * How much of the row an entry has given up, decided by {@link ToolbarFitter}
  * and re-applied by every render until the room changes again.

package/dist/_pkgs/affine-widget-toolbar/utils.js

@@ -210,7 +210,7 @@ export function combine(actions, context) {
     });
     return filtered;
 }
-function group(actions) {
+export function group(actions) {
     const grouped = groupBy(actions, a => a.id);
     const paired = toPairs(grouped).map(([_, items]) => {
         if (items.length === 1)
@@ -222,7 +222,10 @@ function group(actions) {
     });
     return paired;
 }
-const merge = (a, b) => mergeWith(a, b, (obj, src) => Array.isArray(obj) ? group(obj.concat(src)) : src);
+// Only a group's `actions` is a list of entries to merge by id; any other
+// array (a `labelWording` tuple) is a value, and grouping it turned the
+// wording into a keyless object the host's i18next choked on.
+const merge = (a, b) => mergeWith(a, b, (obj, src, key) => key === 'actions' && Array.isArray(obj) ? group(obj.concat(src)) : src);
 export function emptyToolbarLayout() {
     return { shrunk: new Set(), collapsed: new Set() };
 }

package/dist/_pkgs/data-view/core/common/properties.js

@@ -147,11 +147,11 @@ let DataViewPropertiesSettingView = (() => {
       width: 4px;
       height: 12px;
       border-radius: 1px;
-      background-color: #efeff0;
+      background-color: var(--affine-border-color);
     }
 
     .property-item:hover .property-item-drag-bar {
-      background-color: #c0bfc1;
+      background-color: var(--affine-placeholder-color);
     }
 
     .property-item-icon {