@formicoidea/labre-core 0.32.0 → 0.34.1

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

@@ -293,8 +293,12 @@ export class AffineToolbarWidget extends WidgetComponent {
                 // Chencks if block's config exists.
                 if (block) {
                     const modelFlavour = block.model.flavour;
-                    const existed = toolbarRegistry.modules.has(modelFlavour) ||
-                        toolbarRegistry.modules.has(`custom:${modelFlavour}`);
+                    // `modulesFor`, not `modules.has`: the question is whether this
+                    // flavour has a row AT ALL, and since a flavour may be claimed by
+                    // an owner-suffixed contributor as well as by its own key, a raw
+                    // variant lookup would answer "no row" for a flavour that draws one.
+                    const existed = toolbarRegistry.modulesFor(modelFlavour).length > 0 ||
+                        toolbarRegistry.modulesFor(`custom:${modelFlavour}`).length > 0;
                     if (existed) {
                         flavour = modelFlavour;
                     }
@@ -487,6 +491,9 @@ export class AffineToolbarWidget extends WidgetComponent {
         }));
         disposables.add(effect(() => {
             const value = flags.value$.value;
+            // Subscribes to forced refreshes: `flags.refresh()` keeps `value$`
+            // untouched, the revision counter is the only thing that changes.
+            void flags.revision$.value;
             // Hides toolbar
             if (Flag.None === value || flags.check(Flag.Hiding, value)) {
                 this.fitter.reset();
@@ -522,6 +529,8 @@ export class AffineToolbarWidget extends WidgetComponent {
                 abortController.abort();
             }
             const value = flags.value$.value;
+            // Subscribes to forced refreshes, see above.
+            void flags.revision$.value;
             if (!context.activated)
                 return;
             if (Flag.None === value || flags.contains(Flag.Hiding, value))

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

@@ -1,5 +1,5 @@
 import { type EditorToolbar } from '../affine-components/toolbar/index.js';
-import { type ToolbarActions, type ToolbarContext, type ToolbarLayoutStep, type ToolbarPlacement } from '../affine-shared/services/index.js';
+import { ActionPlacement, 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;
@@ -15,7 +15,24 @@ export declare function autoUpdatePosition(signal: AbortSignal, toolbar: EditorT
  * scroll, resize and flip.
  */
 onAvailableWidth?: () => void): () => void;
-export declare function combine(actions: ToolbarActions, context: ToolbarContext): any[];
+export declare function combine(actions: ToolbarActions, context: ToolbarContext): {
+    placement: ActionPlacement;
+    id: string;
+    score?: number;
+    when?: ((cx: ToolbarContext) => boolean) | boolean;
+    active?: ((cx: ToolbarContext) => boolean) | boolean;
+    priority?: number;
+    label?: string;
+    labelWording?: import("../affine-shared/services/index.js").ChromeWording;
+    showLabel?: boolean;
+    icon?: import("lit-html").TemplateResult;
+    tooltip?: string | import("lit-html").TemplateResult;
+    tooltipWording?: import("../affine-shared/services/index.js").ChromeWording;
+    variant?: "destructive";
+    disabled?: ((cx: ToolbarContext) => boolean) | boolean;
+    content?: ((cx: ToolbarContext) => import("lit-html").TemplateResult | null) | (import("lit-html").TemplateResult | null);
+    run?: (cx: ToolbarContext) => void;
+}[];
 /**
  * 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

@@ -1,5 +1,5 @@
 import { renderToolbarSeparator, } from '../affine-components/toolbar/index.js';
-import { ActionPlacement, planToolbarLayout, TOOLBAR_SETTLE_DELAY, toolbarDegradationSteps, toolbarRoomChanged, } from '../affine-shared/services/index.js';
+import { ActionPlacement, planToolbarLayout, TOOLBAR_MORE, TOOLBAR_SETTLE_DELAY, toolbarDegradationSteps, toolbarRoomChanged, translateKey, } from '../affine-shared/services/index.js';
 import { nextTick } from '../global/utils/index.js';
 import { GfxControllerIdentifier } from '../std/gfx/index.js';
 import { MoreVerticalIcon } from '@blocksuite/icons/lit';
@@ -144,10 +144,22 @@ export function combine(actions, context) {
         };
         if ('generate' in action && typeof action.generate === 'function') {
             // TODO(@fundon): should delete `generate` fn
-            return {
-                ...newAction,
-                ...action.generate(context),
-            };
+            Object.assign(newAction, action.generate(context));
+        }
+        // The i18n seam, applied HERE and only here: every path that draws an
+        // entry — the row, a group's children, the "⋮" — goes through `combine`
+        // first, and the row's own signature (`renderToolbar`) reads the resolved
+        // `label` a few lines later, so an entry that changes language is a row
+        // that is re-planned rather than one drawn at the wrong width.
+        //
+        // A declared wording WINS over a static `label` / `tooltip` left beside it:
+        // the static one is the English default and is already the wording's own
+        // fallback, so the two can never disagree.
+        if (newAction.labelWording) {
+            newAction.label = translateKey(context.std, ...newAction.labelWording);
+        }
+        if (newAction.tooltipWording) {
+            newAction.tooltip = translateKey(context.std, ...newAction.tooltipWording);
         }
         return newAction;
     });
@@ -364,8 +376,12 @@ export function renderToolbar(toolbar, context, flavour, source = () => emptyToo
         'custom:affine:*',
     ]
         .flat()
-        .map(key => toolbarRegistry.modules.get(key))
-        .filter(module => !!module)
+        // Every module of each key, not just one: a flavour may be shared by
+        // several contributors (`custom:affine:surface:group` carries Wardley's
+        // qualification dropdown AND C4's morph), and they are told apart by the
+        // owner suffix on their DI variant — see `toolbarModuleKey`.
+        .map(key => toolbarRegistry.modulesFor(key))
+        .flat()
         .filter(module => typeof module.config.when === 'function'
         ? module.config.when(context)
         : (module.config.when ?? true))
@@ -430,6 +446,9 @@ export function renderToolbar(toolbar, context, flavour, source = () => emptyToo
         if (moreMenuItems.length) {
             const key = `${context.getCurrentModel()?.id}`;
             hasMenu = true;
+            // The one word the WIDGET says on its own account, so it is the one
+            // wording no entry can declare for it (#183).
+            const moreLabel = translateKey(context.std, ...TOOLBAR_MORE);
             primary.push({
                 kind: 'template',
                 // Not an entry of the row's signature: the "⋮" is DERIVED from the
@@ -441,8 +460,8 @@ export function renderToolbar(toolbar, context, flavour, source = () => emptyToo
               .contentPadding="${'8px'}"
               .button=${html `
                 <editor-icon-button
-                  aria-label="More"
-                  .tooltip="${'More'}"
+                  aria-label=${moreLabel}
+                  .tooltip="${moreLabel}"
                   .iconContainerPadding=${innerToolbar ? 4 : 2}
                   .iconSize=${innerToolbar ? '16px' : undefined}
                 >

package/dist/_pkgs/data-view/core/group-by/renderer/boolean-group.js

@@ -2,21 +2,21 @@ import { CheckBoxCheckSolidIcon, CheckBoxUnIcon } from '@blocksuite/icons/lit';
 import { css, html } from 'lit';
 import { BaseGroup } from './base.js';
 export class BooleanGroupView extends BaseGroup {
-    static { this.styles = css `
-    .data-view-group-title-boolean-view {
-      display: flex;
-      align-items: center;
-    }
-    .data-view-group-title-boolean-view svg {
-      width: 20px;
-      height: 20px;
-    }
+    static { this.styles = css `
+    .data-view-group-title-boolean-view {
+      display: flex;
+      align-items: center;
+    }
+    .data-view-group-title-boolean-view svg {
+      width: 20px;
+      height: 20px;
+    }
   `; }
     render() {
-        return html ` <div class="data-view-group-title-boolean-view">
+        return html ` <div class="data-view-group-title-boolean-view">
       ${this.value
             ? CheckBoxCheckSolidIcon({ style: `color:#1E96EB` })
-            : CheckBoxUnIcon()}
+            : CheckBoxUnIcon()}
     </div>`;
     }
 }

package/dist/_pkgs/data-view/core/utils/menu-title.js

@@ -1,22 +1,22 @@
 import { ArrowLeftBigIcon } from '@blocksuite/icons/lit';
 import { html } from 'lit';
 export const menuTitle = (name, onBack) => {
-    return html `
-    <div
-      style="display:flex;align-items:center;gap: 4px;padding: 3px 3px 3px 2px"
-    >
-      <div
-        @click=${onBack}
-        class="dv-icon-20 dv-hover dv-pd-2 dv-round-4"
-        style="display:flex;"
-      >
-        ${ArrowLeftBigIcon()}
-      </div>
-      <div
-        style="font-weight:500;font-size: 14px;line-height: 22px;color: var(--affine-text-primary-color)"
-      >
-        ${name}
-      </div>
-    </div>
+    return html `
+    <div
+      style="display:flex;align-items:center;gap: 4px;padding: 3px 3px 3px 2px"
+    >
+      <div
+        @click=${onBack}
+        class="dv-icon-20 dv-hover dv-pd-2 dv-round-4"
+        style="display:flex;"
+      >
+        ${ArrowLeftBigIcon()}
+      </div>
+      <div
+        style="font-weight:500;font-size: 14px;line-height: 22px;color: var(--affine-text-primary-color)"
+      >
+        ${name}
+      </div>
+    </div>
   `;
 };

package/dist/_pkgs/data-view/view-presets/calendar/pc/actions.js

@@ -44,21 +44,17 @@ export const openCalendarEntry = (root, view, entry, target, options) => {
             </div>
             ${entry.location
                     ? html `<div class="calendar-event-popover-row">
-                    <span class="calendar-event-popover-icon"
-                      >${PinIcon()}</span
-                    >
-                    <span>${entry.location}</span>
-                  </div>`
+                  <span class="calendar-event-popover-icon">${PinIcon()}</span>
+                  <span>${entry.location}</span>
+                </div>`
                     : ''}
             ${entry.description
                     ? html `<div class="calendar-event-popover-row">
-                    <span class="calendar-event-popover-icon"
-                      >${TextIcon()}</span
-                    >
-                    <span class="calendar-event-popover-description"
-                      >${entry.description}</span
-                    >
-                  </div>`
+                  <span class="calendar-event-popover-icon">${TextIcon()}</span>
+                  <span class="calendar-event-popover-description"
+                    >${entry.description}</span
+                  >
+                </div>`
                     : ''}
           </div>
         `,

package/dist/_pkgs/data-view/view-presets/calendar/pc/view.js

@@ -532,7 +532,10 @@ export class CalendarViewUI extends DataViewUIBase {
         return html `
       <div
         ${ref(element => this.logic.bindEntryDraggable(dndKey, entry, element))}
-        class="calendar-entry ${entry.kind} ${segmentClass} ${this.logic.selectedEntryId === entry.id ? 'selected' : ''}"
+        class="calendar-entry ${entry.kind} ${segmentClass} ${this.logic
+            .selectedEntryId === entry.id
+            ? 'selected'
+            : ''}"
         role="button"
         tabindex="0"
         aria-label=${entry.title || 'Untitled'}
@@ -546,23 +549,23 @@ export class CalendarViewUI extends DataViewUIBase {
       >
         ${showLeftHandle
             ? html `<span
-                class="calendar-resize-handle left"
-                @pointerdown=${(event) => this.logic.startResize(entry, 'start', event)}
-              ></span>`
+              class="calendar-resize-handle left"
+              @pointerdown=${(event) => this.logic.startResize(entry, 'start', event)}
+            ></span>`
             : nothing}
         ${this.renderEntryTitle(entry)}
         ${entry.kind === 'row' && entry.cardProperties.length
             ? html `<span class="calendar-entry-properties">
-                ${entry.cardProperties.map(property => html `<span class="calendar-entry-property"
-                      >${property.value}</span
-                    >`)}
-              </span>`
+              ${entry.cardProperties.map(property => html `<span class="calendar-entry-property"
+                    >${property.value}</span
+                  >`)}
+            </span>`
             : nothing}
         ${showRightHandle
             ? html `<span
-                class="calendar-resize-handle right"
-                @pointerdown=${(event) => this.logic.startResize(entry, 'end', event)}
-              ></span>`
+              class="calendar-resize-handle right"
+              @pointerdown=${(event) => this.logic.startResize(entry, 'end', event)}
+            ></span>`
             : nothing}
       </div>
     `;
@@ -577,13 +580,15 @@ export class CalendarViewUI extends DataViewUIBase {
         if (entry.titleSegments?.length) {
             return html `<span class="calendar-entry-title title-segments">
         ${entry.titleSegments.map(segment => html `<span
-              class="calendar-entry-title-segment ${segment.linkedDoc ? 'linked-doc-segment' : ''}"
+              class="calendar-entry-title-segment ${segment.linkedDoc
+                ? 'linked-doc-segment'
+                : ''}"
             >
               ${segment.linkedDoc ? LinkedPageIcon() : nothing}
               ${segment.text
                 ? html `<span class="calendar-entry-title-text"
-                      >${segment.text}</span
-                    >`
+                    >${segment.text}</span
+                  >`
                 : nothing}
             </span>`)}
       </span>`;
@@ -667,8 +672,11 @@ export class CalendarViewUI extends DataViewUIBase {
         if (!preview)
             return nothing;
         return html `<div
-      class="calendar-entry-preview ${preview.continuesLeft ? 'continues-left' : ''} ${preview.continuesRight ? 'continues-right' : ''}"
-      style="grid-column:${preview.sIdx + 1} / span ${preview.span};grid-row:${preview.slot + 1};"
+      class="calendar-entry-preview ${preview.continuesLeft
+            ? 'continues-left'
+            : ''} ${preview.continuesRight ? 'continues-right' : ''}"
+      style="grid-column:${preview.sIdx +
+            1} / span ${preview.span};grid-row:${preview.slot + 1};"
     >
       ${preview.title}
     </div>`;
@@ -688,11 +696,11 @@ export class CalendarViewUI extends DataViewUIBase {
         ${this.logic.view.readonly$.value
             ? nothing
             : html `<button
-                class="calendar-empty-month-hint-action"
-                @click=${() => this.logic.createRowOnDate(getDefaultCreateDate(this.logic.currentMonth))}
-              >
-                ${PlusIcon()}<span>New row</span>
-              </button>`}
+              class="calendar-empty-month-hint-action"
+              @click=${() => this.logic.createRowOnDate(getDefaultCreateDate(this.logic.currentMonth))}
+            >
+              ${PlusIcon()}<span>New row</span>
+            </button>`}
         <button
           class="calendar-empty-month-hint-close"
           aria-label="Dismiss"
@@ -727,11 +735,11 @@ export class CalendarViewUI extends DataViewUIBase {
             ${this.logic.isCurrentMonth()
             ? nothing
             : html `<button
-                    class="calendar-today-button"
-                    @click=${() => this.logic.goToday()}
-                  >
-                    <span>Today</span>
-                  </button>`}
+                  class="calendar-today-button"
+                  @click=${() => this.logic.goToday()}
+                >
+                  <span>Today</span>
+                </button>`}
             <button
               class="calendar-icon-button"
               aria-label="Previous month"
@@ -769,7 +777,11 @@ export class CalendarViewUI extends DataViewUIBase {
                 return html `
                         <div
                           data-date=${day.date}
-                          class="calendar-day ${day.inMonth ? '' : 'is-outside'} ${day.date === today ? 'is-today' : ''} ${this.logic.isDayInPreview(day.date)
+                          class="calendar-day ${day.inMonth
+                    ? ''
+                    : 'is-outside'} ${day.date === today
+                    ? 'is-today'
+                    : ''} ${this.logic.isDayInPreview(day.date)
                     ? 'is-drop-target'
                     : ''}"
                           style="--calendar-segment-slots:${getCalendarDaySegmentSlots(day, movingEntryId)};"
@@ -786,13 +798,13 @@ export class CalendarViewUI extends DataViewUIBase {
                           </div>
                           ${canReserveNewRow
                     ? html `<button
-                                  class="calendar-new-row"
-                                  aria-label="+ New row"
-                                  ?disabled=${this.logic.isInteracting}
-                                  @click=${() => this.logic.createRowOnDate(day.date)}
-                                >
-                                  ${PlusIcon()}<span>New row</span>
-                                </button>`
+                                class="calendar-new-row"
+                                aria-label="+ New row"
+                                ?disabled=${this.logic.isInteracting}
+                                @click=${() => this.logic.createRowOnDate(day.date)}
+                              >
+                                ${PlusIcon()}<span>New row</span>
+                              </button>`
                     : nothing}
                         </div>
                       `;
@@ -824,12 +836,12 @@ export class CalendarViewUI extends DataViewUIBase {
         </div>
         ${setup
             ? html `<div class="calendar-setup">
-                <button
-                  @click=${(event) => this.logic.openSetupMenu(event.currentTarget)}
-                >
-                  ${TodayIcon()}<span>Select or create date property</span>
-                </button>
-              </div>`
+              <button
+                @click=${(event) => this.logic.openSetupMenu(event.currentTarget)}
+              >
+                ${TodayIcon()}<span>Select or create date property</span>
+              </button>
+            </div>`
             : nothing}
       </div>
     `;

package/dist/_pkgs/data-view/view-presets/table/mobile/group.js

@@ -246,7 +246,9 @@ let MobileTableGroup = (() => {
           class="group-toggle-btn"
           role="button"
           aria-expanded=${this.collapsed$.value ? 'false' : 'true'}
-          aria-label=${this.collapsed$.value ? 'Expand group' : 'Collapse group'}
+          aria-label=${this.collapsed$.value
+                    ? 'Expand group'
+                    : 'Collapse group'}
           tabindex="0"
           @click=${this._toggleCollapse}
           @keydown=${(e) => {

package/dist/_pkgs/data-view/view-presets/table/pc/group.js

@@ -303,7 +303,9 @@ let TableGroup = (() => {
           class="group-toggle-btn"
           role="button"
           aria-expanded=${this.collapsed$.value ? 'false' : 'true'}
-          aria-label=${this.collapsed$.value ? 'Expand group' : 'Collapse group'}
+          aria-label=${this.collapsed$.value
+                    ? 'Expand group'
+                    : 'Collapse group'}
           tabindex="0"
           @click=${this._toggleCollapse}
           @keydown=${(e) => {

package/dist/_pkgs/data-view/view-presets/table/pc-virtual/group/top/group-title.js

@@ -19,9 +19,9 @@ export const GroupTitle = (groupData, ops) => {
     }
     const icon = groupData.value == null
         ? ''
-        : html ` <uni-lit
-          class="${groupHeaderIcon}"
-          .uni="${groupData.property.icon}"
+        : html ` <uni-lit
+          class="${groupHeaderIcon}"
+          .uni="${groupData.property.icon}"
         ></uni-lit>`;
     const props = {
         group: groupData,
@@ -29,25 +29,25 @@ export const GroupTitle = (groupData, ops) => {
     };
     const showColumnName = groupData.property.type$.value === 'checkbox';
     const columnName = showColumnName
-        ? html `<span class="${groupHeaderTitle}"
-        >${groupData.property.name$.value}</span
+        ? html `<span class="${groupHeaderTitle}"
+        >${groupData.property.name$.value}</span
       >`
         : nothing;
     const opsClass = clsx(ops.groupHover && show, groupHeaderOps);
-    return html `
-    <div class="${groupTitleRow}">
-      ${icon} ${renderUniLit(view, props)} ${columnName}
-      ${GroupHeaderCount(groupData)}
-    </div>
+    return html `
+    <div class="${groupTitleRow}">
+      ${icon} ${renderUniLit(view, props)} ${columnName}
+      ${GroupHeaderCount(groupData)}
+    </div>
     ${!ops.readonly
-        ? html ` <div class="${opsClass}">
-          <div @click="${ops.clickAdd}" class="${groupHeaderOp}">
-            ${PlusIcon()}
-          </div>
-          <div @click="${ops.clickOps}" class="${groupHeaderOp}">
-            ${MoreHorizontalIcon()}
-          </div>
+        ? html ` <div class="${opsClass}">
+          <div @click="${ops.clickAdd}" class="${groupHeaderOp}">
+            ${PlusIcon()}
+          </div>
+          <div @click="${ops.clickOps}" class="${groupHeaderOp}">
+            ${MoreHorizontalIcon()}
+          </div>
         </div>`
-        : nothing}
+        : nothing}
   `;
 };

package/dist/_pkgs/std/clipboard/utils.js

@@ -3,7 +3,10 @@
  * Used to embed plain text in the clipboard snapshot wrapper.
  */
 export function escapeHTML(value) {
-    return value.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+    return value
+        .replace(/&/g, '&amp;')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;');
 }
 export function onlyContainImgElement(ast) {
     if (ast.type === 'element') {