@formicoidea/labre-core 0.29.1 → 0.31.0

package/dist/_pkgs/affine-gfx-shape/adapter/markdown/index.js

@@ -1,5 +1,5 @@
 import { ElementToMarkdownAdapterExtension } from '../../../affine-block-surface/index.js';
-import { getShapeText, getShapeType } from '../utils';
+import { getShapeText, getShapeType } from '../utils.js';
 export const shapeToMarkdownAdapterMatcher = ElementToMarkdownAdapterExtension({
     name: 'shape',
     match: elementModel => elementModel.type === 'shape',

package/dist/_pkgs/affine-gfx-shape/adapter/plain-text/index.js

@@ -1,5 +1,5 @@
 import { ElementToPlainTextAdapterExtension } from '../../../affine-block-surface/index.js';
-import { getShapeText, getShapeType } from '../utils';
+import { getShapeText, getShapeType } from '../utils.js';
 export const shapeToPlainTextAdapterMatcher = ElementToPlainTextAdapterExtension({
     name: 'shape',
     match: elementModel => elementModel.type === 'shape',

package/dist/_pkgs/affine-gfx-shape/components/shape-panel.d.ts

@@ -1,7 +1,7 @@
 import { ShapeStyle } from '../../affine-model/index.js';
 import { LitElement } from 'lit';
 import { Subject } from 'rxjs';
-import type { ShapeTool } from '../shape-tool';
+import type { ShapeTool } from '../shape-tool.js';
 export declare class EdgelessShapePanel extends LitElement {
     static styles: import("lit").CSSResult;
     slots: {

package/dist/_pkgs/affine-gfx-shape/components/shape-panel.js

@@ -37,7 +37,7 @@ import { css, html, LitElement } from 'lit';
 import { property } from 'lit/decorators.js';
 import { repeat } from 'lit/directives/repeat.js';
 import { Subject } from 'rxjs';
-import { ShapeComponentConfig } from '../toolbar/shape-menu-config';
+import { ShapeComponentConfig } from '../toolbar/shape-menu-config.js';
 let EdgelessShapePanel = (() => {
     let _classSuper = LitElement;
     let _selectedShape_decorators;

package/dist/_pkgs/affine-gfx-shape/draggable/index.d.ts

@@ -1,4 +1,4 @@
-export * from './shape-draggable';
-export * from './shape-menu';
-export * from './shape-tool-button';
-export * from './shape-tool-element';
+export * from './shape-draggable.js';
+export * from './shape-menu.js';
+export * from './shape-tool-button.js';
+export * from './shape-tool-element.js';

package/dist/_pkgs/affine-gfx-shape/draggable/index.js

@@ -1,4 +1,4 @@
-export * from './shape-draggable';
-export * from './shape-menu';
-export * from './shape-tool-button';
-export * from './shape-tool-element';
+export * from './shape-draggable.js';
+export * from './shape-menu.js';
+export * from './shape-tool-button.js';
+export * from './shape-tool-element.js';

package/dist/_pkgs/affine-gfx-shape/draggable/shape-menu.js

@@ -41,9 +41,9 @@ import { computed, effect, signal } from '@preact/signals-core';
 import { css, html, LitElement } from 'lit';
 import { property } from 'lit/decorators.js';
 import { when } from 'lit/directives/when.js';
-import { PolygonTool } from '../polygon-tool';
-import { ShapeTool } from '../shape-tool';
-import { ShapeComponentConfig } from '../toolbar';
+import { PolygonTool } from '../polygon-tool.js';
+import { ShapeTool } from '../shape-tool.js';
+import { ShapeComponentConfig } from '../toolbar/index.js';
 let EdgelessShapeMenu = (() => {
     let _classSuper = SignalWatcher(WithDisposable(LitElement));
     let _edgeless_decorators;

package/dist/_pkgs/affine-gfx-shape/draggable/shape-tool-element.js

@@ -40,7 +40,7 @@ import { sleep } from '../../global/utils/index.js';
 import { GfxControllerIdentifier } from '../../std/gfx/index.js';
 import { css, html, LitElement, } from 'lit';
 import { property, query, state } from 'lit/decorators.js';
-import { ShapeTool } from '../shape-tool';
+import { ShapeTool } from '../shape-tool.js';
 let EdgelessShapeToolElement = (() => {
     let _classSuper = WithDisposable(LitElement);
     let __backupShapeElement_decorators;

package/dist/_pkgs/affine-gfx-shape/effects.d.ts

@@ -1,7 +1,7 @@
-import { EdgelessShapePanel } from './components/shape-panel';
-import { EdgelessShapeStylePanel } from './components/shape-style-panel';
-import { EdgelessShapeMenu, EdgelessShapeToolButton, EdgelessShapeToolElement, EdgelessToolbarShapeDraggable } from './draggable';
-import { EdgelessShapeTextEditor } from './text/edgeless-shape-text-editor';
+import { EdgelessShapePanel } from './components/shape-panel.js';
+import { EdgelessShapeStylePanel } from './components/shape-style-panel.js';
+import { EdgelessShapeMenu, EdgelessShapeToolButton, EdgelessShapeToolElement, EdgelessToolbarShapeDraggable } from './draggable/index.js';
+import { EdgelessShapeTextEditor } from './text/edgeless-shape-text-editor.js';
 export declare function effects(): void;
 declare global {
     interface HTMLElementTagNameMap {

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

@@ -1,7 +1,7 @@
-import { EdgelessShapePanel } from './components/shape-panel';
-import { EdgelessShapeStylePanel } from './components/shape-style-panel';
-import { EdgelessShapeMenu, EdgelessShapeToolButton, EdgelessShapeToolElement, EdgelessToolbarShapeDraggable, } from './draggable';
-import { EdgelessShapeTextEditor } from './text/edgeless-shape-text-editor';
+import { EdgelessShapePanel } from './components/shape-panel.js';
+import { EdgelessShapeStylePanel } from './components/shape-style-panel.js';
+import { EdgelessShapeMenu, EdgelessShapeToolButton, EdgelessShapeToolElement, EdgelessToolbarShapeDraggable, } from './draggable/index.js';
+import { EdgelessShapeTextEditor } from './text/edgeless-shape-text-editor.js';
 export function effects() {
     customElements.define('edgeless-shape-text-editor', EdgelessShapeTextEditor);
     customElements.define('edgeless-shape-menu', EdgelessShapeMenu);

package/dist/_pkgs/affine-gfx-shape/element-renderer/index.d.ts

@@ -1,2 +1,2 @@
-export * from './highlighter';
-export * from './shape';
+export * from './highlighter.js';
+export * from './shape/index.js';

package/dist/_pkgs/affine-gfx-shape/element-renderer/index.js

@@ -1,2 +1,2 @@
-export * from './highlighter';
-export * from './shape';
+export * from './highlighter.js';
+export * from './shape/index.js';

package/dist/_pkgs/affine-gfx-shape/element-renderer/shape/index.d.ts

@@ -4,4 +4,4 @@ export declare const shape: ElementRenderer<ShapeElementModel>;
 export declare const ShapeElementRendererExtension: import("../../../store/index.js").ExtensionType & {
     identifier: import("../../../global/di/types.js").ServiceIdentifier<ElementRenderer<ShapeElementModel>>;
 };
-export * from './utils';
+export * from './utils.js';

package/dist/_pkgs/affine-gfx-shape/element-renderer/shape/index.js

@@ -8,6 +8,7 @@ import { ellipse } from './ellipse.js';
 import { polygon } from './polygon.js';
 import { rect } from './rect.js';
 import { triangle } from './triangle.js';
+import { effectiveShapeFontSize } from './utils.js';
 import { horizontalOffset, verticalOffset } from './utils.js';
 const shapeRenderers = {
     diamond,
@@ -27,13 +28,20 @@ export const shape = (model, ctx, matrix, renderer, rc) => {
     }
 };
 export const ShapeElementRendererExtension = ElementRendererExtension('shape', shape);
-export * from './utils';
+export * from './utils.js';
 function renderText(model, ctx, { color }) {
-    const { x, y, text, fontSize, fontFamily, fontWeight, textAlign, w, h, textVerticalAlign, padding, } = model;
+    const { x, y, text, fontFamily, fontWeight, textAlign, w, h, textVerticalAlign, padding, } = model;
     if (!text)
         return;
+    // Contained mode shrinks the layout font size so the text fits the bounds.
+    const fontSize = effectiveShapeFontSize(model);
     const [verticalPadding, horPadding] = padding;
-    const font = getFontString(model);
+    const font = getFontString({
+        fontStyle: model.fontStyle,
+        fontWeight,
+        fontSize,
+        fontFamily,
+    });
     const { lineGap, lineHeight } = measureTextInDOM(fontFamily, fontSize, fontWeight);
     const metrics = getFontMetrics(fontFamily, fontSize, fontWeight);
     const lines = typeof text === 'string'

package/dist/_pkgs/affine-gfx-shape/element-renderer/shape/utils.d.ts

@@ -1,6 +1,6 @@
 import type { CanvasRenderer } from '../../../affine-block-surface/index.js';
 import { type TextDelta } from '../../../affine-gfx-text/index.js';
-import type { LocalShapeElementModel, ShapeElementModel, TextAlign, TextVerticalAlign } from '../../../affine-model/index.js';
+import { type LocalShapeElementModel, type ShapeElementModel, type TextAlign, type TextVerticalAlign } from '../../../affine-model/index.js';
 import type { Bound } from '../../../global/gfx/index.js';
 export type Colors = {
     color: string;
@@ -10,5 +10,16 @@ export type Colors = {
 export declare function drawGeneralShape(ctx: CanvasRenderingContext2D, shapeModel: ShapeElementModel | LocalShapeElementModel, renderer: CanvasRenderer, filled: boolean, fillColor: string, strokeColor: string): void;
 export declare function horizontalOffset(width: number, textAlign: TextAlign, horiPadding: number): number;
 export declare function verticalOffset(lines: TextDelta[][], lineHeight: number, height: number, textVerticalAlign: TextVerticalAlign, verticalPadding: number): number;
+/** The floor for `TextFitMode.Contained` font shrinking. */
+export declare const MIN_CONTAINED_FONT_SIZE = 8;
+/**
+ * The font size actually used to lay out a shape's text. In
+ * {@link TextFitMode.Contained} it is the largest size (at most the
+ * configured `fontSize`, at least {@link MIN_CONTAINED_FONT_SIZE}) whose
+ * wrapped text fits the shape's fixed bounds; every other mode uses the
+ * configured size as-is. Local shape models have no `textFitMode` and always
+ * use the configured size.
+ */
+export declare function effectiveShapeFontSize(model: ShapeElementModel | LocalShapeElementModel): number;
 export declare function normalizeShapeBound(shape: ShapeElementModel, bound: Bound): Bound;
 export declare function fitContent(shape: ShapeElementModel): void;

package/dist/_pkgs/affine-gfx-shape/element-renderer/shape/utils.js

@@ -1,4 +1,5 @@
 import { getFontString, getLineHeight, getLineWidth, getTextWidth, measureTextInDOM, wrapText, wrapTextDeltas, } from '../../../affine-gfx-text/index.js';
+import { TextFitMode, } from '../../../affine-model/index.js';
 import { FeatureFlagService } from '../../../affine-shared/services/index.js';
 import { deltaInsertsToChunks } from '../../../std/inline/index.js';
 export function drawGeneralShape(ctx, shapeModel, renderer, filled, fillColor, strokeColor) {
@@ -182,8 +183,46 @@ export function verticalOffset(lines, lineHeight, height, textVerticalAlign, ver
             ? verticalPadding
             : height - lineHeight * lines.length - verticalPadding;
 }
+/** The floor for `TextFitMode.Contained` font shrinking. */
+export const MIN_CONTAINED_FONT_SIZE = 8;
+/**
+ * The font size actually used to lay out a shape's text. In
+ * {@link TextFitMode.Contained} it is the largest size (at most the
+ * configured `fontSize`, at least {@link MIN_CONTAINED_FONT_SIZE}) whose
+ * wrapped text fits the shape's fixed bounds; every other mode uses the
+ * configured size as-is. Local shape models have no `textFitMode` and always
+ * use the configured size.
+ */
+export function effectiveShapeFontSize(model) {
+    const mode = 'textFitMode' in model ? model.textFitMode : TextFitMode.Grow;
+    const text = model.text;
+    if (mode !== TextFitMode.Contained || !text || typeof text === 'string') {
+        return model.fontSize;
+    }
+    const [verticalPadding, horiPadding] = model.padding;
+    const availableW = model.w - horiPadding * 2;
+    const availableH = model.h - verticalPadding * 2;
+    // Linear scan from the configured size down: shape text is short, so the
+    // handful of measure passes is cheap and keeps the logic obvious.
+    for (let size = model.fontSize; size > MIN_CONTAINED_FONT_SIZE; size--) {
+        const font = getFontString({
+            fontStyle: model.fontStyle,
+            fontWeight: model.fontWeight,
+            fontSize: size,
+            fontFamily: model.fontFamily,
+        });
+        const lines = deltaInsertsToChunks(wrapTextDeltas(text, font, availableW));
+        const lineHeight = getLineHeight(model.fontFamily, size, model.fontWeight);
+        if (lineHeight * lines.length <= availableH) {
+            return size;
+        }
+    }
+    return MIN_CONTAINED_FONT_SIZE;
+}
 export function normalizeShapeBound(shape, bound) {
-    if (!shape.text)
+    // Contained / overflow: the shape's bounds are user-controlled and never
+    // grown (or clamped) to fit the text.
+    if (!shape.text || shape.textFitMode !== TextFitMode.Grow)
         return bound;
     const [verticalPadding, horiPadding] = shape.padding;
     const yText = shape.text;

package/dist/_pkgs/affine-gfx-shape/element-renderer/shape-dom/index.js

@@ -1,6 +1,6 @@
 import { DefaultTheme } from '../../../affine-model/index.js';
 import { SVGShapeBuilder } from '../../../global/gfx/index.js';
-import { manageClassNames, setStyles } from './utils';
+import { manageClassNames, setStyles } from './utils.js';
 function applyShapeSpecificStyles(model, element, zoom) {
     // Reset properties that might be set by different shape types
     element.style.removeProperty('clip-path');

package/dist/_pkgs/affine-gfx-shape/element-view.d.ts

@@ -1,6 +1,6 @@
 import { ShapeElementModel } from '../affine-model/index.js';
 import { GfxElementModelView } from '../std/gfx/index.js';
-import { PolygonVertexEditingOverlay } from './overlay/polygon-vertex-editing-overlay';
+import { PolygonVertexEditingOverlay } from './overlay/polygon-vertex-editing-overlay.js';
 export declare class ShapeElementView extends GfxElementModelView<ShapeElementModel> {
     static type: string;
     /** Overlay for polygon vertex editing (only active for polygon shapes). */

package/dist/_pkgs/affine-gfx-shape/element-view.js

@@ -3,9 +3,9 @@ import { ConnectorPathGenerator } from '../affine-gfx-connector/index.js';
 import { ShapeElementModel, ShapeType, } from '../affine-model/index.js';
 import { Bound, rotatePoint } from '../global/gfx/index.js';
 import { GfxElementModelView, GfxViewInteractionExtension, } from '../std/gfx/index.js';
-import { normalizeShapeBound } from './element-renderer';
-import { PolygonVertexEditingOverlay } from './overlay/polygon-vertex-editing-overlay';
-import { mountShapeTextEditor } from './text/edgeless-shape-text-editor';
+import { normalizeShapeBound } from './element-renderer/index.js';
+import { PolygonVertexEditingOverlay } from './overlay/polygon-vertex-editing-overlay.js';
+import { mountShapeTextEditor } from './text/edgeless-shape-text-editor.js';
 export class ShapeElementView extends GfxElementModelView {
     constructor() {
         super(...arguments);

package/dist/_pkgs/affine-gfx-shape/index.d.ts

@@ -1,10 +1,12 @@
-export * from './adapter';
-export * from './consts';
-export * from './draggable';
-export * from './element-renderer';
-export * from './element-view';
-export * from './overlay';
-export * from './polygon-tool';
-export * from './shape-tool';
-export * from './text';
-export * from './toolbar';
+export * from './adapter/index.js';
+export * from './consts.js';
+export * from './draggable/index.js';
+export * from './element-renderer/index.js';
+export * from './element-view.js';
+export * from './overlay/index.js';
+export * from './polygon-tool.js';
+export * from './shape-tool.js';
+export * from './shortcuts.js';
+export * from './text/index.js';
+export * from './text-fit.js';
+export * from './toolbar/index.js';

package/dist/_pkgs/affine-gfx-shape/index.js

@@ -1,10 +1,12 @@
-export * from './adapter';
-export * from './consts';
-export * from './draggable';
-export * from './element-renderer';
-export * from './element-view';
-export * from './overlay';
-export * from './polygon-tool';
-export * from './shape-tool';
-export * from './text';
-export * from './toolbar';
+export * from './adapter/index.js';
+export * from './consts.js';
+export * from './draggable/index.js';
+export * from './element-renderer/index.js';
+export * from './element-view.js';
+export * from './overlay/index.js';
+export * from './polygon-tool.js';
+export * from './shape-tool.js';
+export * from './shortcuts.js';
+export * from './text/index.js';
+export * from './text-fit.js';
+export * from './toolbar/index.js';

package/dist/_pkgs/affine-gfx-shape/overlay/diamond.d.ts

@@ -1,5 +1,5 @@
 import type { RoughCanvas } from '../../affine-block-surface/index.js';
-import { Shape } from './shape';
+import { Shape } from './shape.js';
 export declare class DiamondShape extends Shape {
     draw(ctx: CanvasRenderingContext2D, rc: RoughCanvas): void;
 }

package/dist/_pkgs/affine-gfx-shape/overlay/diamond.js

@@ -1,5 +1,5 @@
-import { Shape } from './shape';
-import { drawGeneralShape } from './utils';
+import { Shape } from './shape.js';
+import { drawGeneralShape } from './utils.js';
 export class DiamondShape extends Shape {
     draw(ctx, rc) {
         if (this.shapeStyle === 'Scribbled') {

package/dist/_pkgs/affine-gfx-shape/overlay/ellipse.d.ts

@@ -1,5 +1,5 @@
 import type { RoughCanvas } from '../../affine-block-surface/index.js';
-import { Shape } from './shape';
+import { Shape } from './shape.js';
 export declare class EllipseShape extends Shape {
     draw(ctx: CanvasRenderingContext2D, rc: RoughCanvas): void;
 }

package/dist/_pkgs/affine-gfx-shape/overlay/ellipse.js

@@ -1,5 +1,5 @@
-import { Shape } from './shape';
-import { drawGeneralShape } from './utils';
+import { Shape } from './shape.js';
+import { drawGeneralShape } from './utils.js';
 export class EllipseShape extends Shape {
     draw(ctx, rc) {
         if (this.shapeStyle === 'Scribbled') {

package/dist/_pkgs/affine-gfx-shape/overlay/factory.d.ts

@@ -1,7 +1,7 @@
 import type { Options } from '../../affine-block-surface/index.js';
 import type { ShapeStyle } from '../../affine-model/index.js';
 import type { XYWH } from '../../global/gfx/index.js';
-import type { Shape } from './shape';
+import type { Shape } from './shape.js';
 export declare class ShapeFactory {
     static createShape(xywh: XYWH, type: string, options: Options, shapeStyle: ShapeStyle): Shape;
 }

package/dist/_pkgs/affine-gfx-shape/overlay/factory.js

@@ -1,9 +1,9 @@
-import { DiamondShape } from './diamond';
-import { EllipseShape } from './ellipse';
-import { PolygonShape } from './polygon';
-import { RectShape } from './rect';
-import { RoundedRectShape } from './rounded-rect';
-import { TriangleShape } from './triangle';
+import { DiamondShape } from './diamond.js';
+import { EllipseShape } from './ellipse.js';
+import { PolygonShape } from './polygon.js';
+import { RectShape } from './rect.js';
+import { RoundedRectShape } from './rounded-rect.js';
+import { TriangleShape } from './triangle.js';
 export class ShapeFactory {
     static createShape(xywh, type, options, shapeStyle) {
         switch (type) {

package/dist/_pkgs/affine-gfx-shape/overlay/index.d.ts

@@ -1,5 +1,5 @@
-export * from './factory';
-export * from './polygon-drawing-overlay';
-export * from './polygon-vertex-editing-overlay';
-export * from './shape';
-export * from './shape-overlay';
+export * from './factory.js';
+export * from './polygon-drawing-overlay.js';
+export * from './polygon-vertex-editing-overlay.js';
+export * from './shape.js';
+export * from './shape-overlay.js';

package/dist/_pkgs/affine-gfx-shape/overlay/index.js

@@ -1,5 +1,5 @@
-export * from './factory';
-export * from './polygon-drawing-overlay';
-export * from './polygon-vertex-editing-overlay';
-export * from './shape';
-export * from './shape-overlay';
+export * from './factory.js';
+export * from './polygon-drawing-overlay.js';
+export * from './polygon-vertex-editing-overlay.js';
+export * from './shape.js';
+export * from './shape-overlay.js';

package/dist/_pkgs/affine-gfx-shape/overlay/polygon.d.ts

@@ -1,5 +1,5 @@
 import type { RoughCanvas } from '../../affine-block-surface/index.js';
-import { Shape } from './shape';
+import { Shape } from './shape.js';
 export declare class PolygonShape extends Shape {
     draw(ctx: CanvasRenderingContext2D, rc: RoughCanvas): void;
 }

package/dist/_pkgs/affine-gfx-shape/overlay/polygon.js

@@ -1,5 +1,5 @@
-import { Shape } from './shape';
-import { drawGeneralShape } from './utils';
+import { Shape } from './shape.js';
+import { drawGeneralShape } from './utils.js';
 export class PolygonShape extends Shape {
     draw(ctx, rc) {
         const [x, y, w, h] = this.xywh;

package/dist/_pkgs/affine-gfx-shape/overlay/rect.d.ts

@@ -1,5 +1,5 @@
 import type { RoughCanvas } from '../../affine-block-surface/index.js';
-import { Shape } from './shape';
+import { Shape } from './shape.js';
 export declare class RectShape extends Shape {
     draw(ctx: CanvasRenderingContext2D, rc: RoughCanvas): void;
 }

package/dist/_pkgs/affine-gfx-shape/overlay/rect.js

@@ -1,5 +1,5 @@
-import { Shape } from './shape';
-import { drawGeneralShape } from './utils';
+import { Shape } from './shape.js';
+import { drawGeneralShape } from './utils.js';
 export class RectShape extends Shape {
     draw(ctx, rc) {
         if (this.shapeStyle === 'Scribbled') {

package/dist/_pkgs/affine-gfx-shape/overlay/rounded-rect.d.ts

@@ -1,5 +1,5 @@
 import type { RoughCanvas } from '../../affine-block-surface/index.js';
-import { Shape } from './shape';
+import { Shape } from './shape.js';
 export declare class RoundedRectShape extends Shape {
     draw(ctx: CanvasRenderingContext2D, rc: RoughCanvas): void;
 }

package/dist/_pkgs/affine-gfx-shape/overlay/rounded-rect.js

@@ -1,5 +1,5 @@
-import { Shape } from './shape';
-import { drawGeneralShape } from './utils';
+import { Shape } from './shape.js';
+import { drawGeneralShape } from './utils.js';
 export class RoundedRectShape extends Shape {
     draw(ctx, rc) {
         if (this.shapeStyle === 'Scribbled') {

package/dist/_pkgs/affine-gfx-shape/overlay/shape-overlay.d.ts

@@ -1,7 +1,7 @@
 import { type Options, type RoughCanvas, ToolOverlay } from '../../affine-block-surface/index.js';
 import { type Color, type ShapeStyle } from '../../affine-model/index.js';
 import type { GfxController } from '../../std/gfx/index.js';
-import type { Shape } from './shape';
+import type { Shape } from './shape.js';
 export declare class ShapeOverlay extends ToolOverlay {
     shape: Shape;
     constructor(gfx: GfxController, type: string, options: Options, style: {

package/dist/_pkgs/affine-gfx-shape/overlay/shape-overlay.js

@@ -3,8 +3,8 @@ import { DefaultTheme, } from '../../affine-model/index.js';
 import { ThemeProvider } from '../../affine-shared/services/index.js';
 import { assertType } from '../../global/utils/index.js';
 import { effect } from '@preact/signals-core';
-import { SHAPE_OVERLAY_HEIGHT, SHAPE_OVERLAY_OFFSET_X, SHAPE_OVERLAY_OFFSET_Y, SHAPE_OVERLAY_WIDTH, } from '../consts';
-import { ShapeFactory } from './factory';
+import { SHAPE_OVERLAY_HEIGHT, SHAPE_OVERLAY_OFFSET_X, SHAPE_OVERLAY_OFFSET_Y, SHAPE_OVERLAY_WIDTH, } from '../consts.js';
+import { ShapeFactory } from './factory.js';
 export class ShapeOverlay extends ToolOverlay {
     constructor(gfx, type, options, style) {
         super(gfx);

package/dist/_pkgs/affine-gfx-shape/overlay/triangle.d.ts

@@ -1,5 +1,5 @@
 import type { RoughCanvas } from '../../affine-block-surface/index.js';
-import { Shape } from './shape';
+import { Shape } from './shape.js';
 export declare class TriangleShape extends Shape {
     draw(ctx: CanvasRenderingContext2D, rc: RoughCanvas): void;
 }

package/dist/_pkgs/affine-gfx-shape/overlay/triangle.js

@@ -1,5 +1,5 @@
-import { Shape } from './shape';
-import { drawGeneralShape } from './utils';
+import { Shape } from './shape.js';
+import { drawGeneralShape } from './utils.js';
 export class TriangleShape extends Shape {
     draw(ctx, rc) {
         if (this.shapeStyle === 'Scribbled') {

package/dist/_pkgs/affine-gfx-shape/shortcuts.d.ts

@@ -0,0 +1,6 @@
+import type { ShortcutDescriptor } from '../std/index.js';
+/**
+ * Shape shortcuts (edgeless scope, always-on — shapes are core canvas).
+ * Host-rebindable via `ShortcutOverrides`.
+ */
+export declare const shapeShortcuts: ShortcutDescriptor[];

package/dist/_pkgs/affine-gfx-shape/shortcuts.js

@@ -0,0 +1,28 @@
+import { ShapeElementModel, TextFitMode } from '../affine-model/index.js';
+import { GfxControllerIdentifier } from '../std/gfx/index.js';
+import { applyTextFitMode, nextTextFitMode } from './text-fit.js';
+/**
+ * Shape shortcuts (edgeless scope, always-on — shapes are core canvas).
+ * Host-rebindable via `ShortcutOverrides`.
+ */
+export const shapeShortcuts = [
+    {
+        id: 'shape.cycleTextFit',
+        labelKey: 'com.labre.keyboardShortcuts.shape.cycleTextFit',
+        defaultKeys: { mac: ['Mod-Shift-f'], other: ['Mod-Shift-f'] },
+        scope: 'edgeless',
+        owner: 'core',
+        handler: std => ctx => {
+            const gfx = std.get(GfxControllerIdentifier);
+            if (gfx.selection.editing)
+                return false;
+            const models = gfx.selection.selectedElements.filter((el) => el instanceof ShapeElementModel && !!el.text);
+            if (!models.length)
+                return false;
+            ctx.get('defaultState').event.preventDefault();
+            const mode = models[0].textFitMode ?? TextFitMode.Grow;
+            applyTextFitMode(std, models, nextTextFitMode(mode));
+            return true;
+        },
+    },
+];

package/dist/_pkgs/affine-gfx-shape/store.js

@@ -1,5 +1,5 @@
 import { StoreExtensionProvider, } from '../affine-ext-loader/index.js';
-import { shapeToMarkdownAdapterMatcher, shapeToPlainTextAdapterMatcher, } from './adapter';
+import { shapeToMarkdownAdapterMatcher, shapeToPlainTextAdapterMatcher, } from './adapter/index.js';
 export class ShapeStoreExtension extends StoreExtensionProvider {
     constructor() {
         super(...arguments);

package/dist/_pkgs/affine-gfx-shape/text/edgeless-shape-text-editor.js

@@ -33,7 +33,7 @@ var __runInitializers = (this && this.__runInitializers) || function (thisArg, i
     return useValue ? value : void 0;
 };
 import { DefaultTool, EdgelessCRUDIdentifier, TextUtils, } from '../../affine-block-surface/index.js';
-import { MindmapElementModel, ShapeElementModel, TextResizing, } from '../../affine-model/index.js';
+import { MindmapElementModel, ShapeElementModel, TextFitMode, TextResizing, } from '../../affine-model/index.js';
 import { ThemeProvider } from '../../affine-shared/services/index.js';
 import { getSelectedRect } from '../../affine-shared/utils/index.js';
 import { BlockSuiteError, ErrorCode } from '../../global/exceptions/index.js';
@@ -47,6 +47,7 @@ import { html, nothing } from 'lit';
 import { property, query } from 'lit/decorators.js';
 import { styleMap } from 'lit/directives/style-map.js';
 import * as Y from 'yjs';
+import { effectiveShapeFontSize } from '../element-renderer/shape/utils.js';
 export function mountShapeTextEditor(shapeElement, edgeless) {
     const mountElm = edgeless.querySelector('.edgeless-mount-point');
     if (!mountElm) {
@@ -180,6 +181,18 @@ let EdgelessShapeTextEditor = (() => {
             });
         }
         _updateElementWH() {
+            if (this.element.textFitMode !== TextFitMode.Grow) {
+                // Fixed shape bounds: typing never resizes the shape. Contained mode
+                // re-renders so the derived font size tracks the new content.
+                if (this.element.textFitMode === TextFitMode.Contained) {
+                    this.requestUpdate();
+                }
+                this.selection.set({
+                    elements: [this.element.id],
+                    editing: true,
+                });
+                return;
+            }
             const bcr = this.richText.getBoundingClientRect();
             const containerHeight = this.richText.offsetHeight;
             const containerWidth = this.richText.offsetWidth;
@@ -285,7 +298,8 @@ let EdgelessShapeTextEditor = (() => {
             const rotate = this.element.rotate;
             const [leftTopX, leftTopY] = Vec.rotWith([rect.left, rect.top], [rect.left + rect.width / 2, rect.top + rect.height / 2], toRadian(rotate));
             const [x, y] = this.gfx.viewport.toViewCoord(leftTopX, leftTopY);
-            const autoWidth = textResizing === TextResizing.AUTO_WIDTH_AND_HEIGHT;
+            const fixedBounds = this.element.textFitMode !== TextFitMode.Grow;
+            const autoWidth = !fixedBounds && textResizing === TextResizing.AUTO_WIDTH_AND_HEIGHT;
             const color = this.std
                 .get(ThemeProvider)
                 .generateColorProperty(this.element.color, '#000000');
@@ -293,21 +307,15 @@ let EdgelessShapeTextEditor = (() => {
                 position: 'absolute',
                 left: x + 'px',
                 top: y + 'px',
-                width: textResizing === TextResizing.AUTO_HEIGHT
-                    ? rect.width + 'px'
-                    : 'fit-content',
+                width: autoWidth ? 'fit-content' : rect.width + 'px',
                 // override rich-text style (height: 100%)
                 height: 'initial',
-                minHeight: textResizing === TextResizing.AUTO_WIDTH_AND_HEIGHT
-                    ? '1em'
-                    : `${rect.height}px`,
-                maxWidth: textResizing === TextResizing.AUTO_WIDTH_AND_HEIGHT
-                    ? this.element.maxWidth
-                        ? `${this.element.maxWidth}px`
-                        : undefined
+                minHeight: autoWidth ? '1em' : `${rect.height}px`,
+                maxWidth: autoWidth && this.element.maxWidth
+                    ? `${this.element.maxWidth}px`
                     : undefined,
                 boxSizing: 'border-box',
-                fontSize: this.element.fontSize + 'px',
+                fontSize: effectiveShapeFontSize(this.element) + 'px',
                 fontFamily: TextUtils.wrapFontFamily(this.element.fontFamily),
                 fontWeight: this.element.fontWeight,
                 lineHeight: 'normal',