@univerjs/engine-render 1.0.0-alpha.7 → 1.0.0-beta.0

package/lib/types/alignment-snap.d.ts

@@ -0,0 +1,67 @@
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export interface IAlignmentRect {
+    left: number;
+    top: number;
+    width: number;
+    height: number;
+}
+export type AlignmentSnapAxis = 'x' | 'y';
+export interface IAlignmentSnapGuide {
+    id: string;
+    axis: AlignmentSnapAxis;
+    position: number;
+}
+export interface IAlignmentSnapSessionConfig {
+    enterThreshold?: number;
+    exitThreshold?: number;
+    breakawayThreshold?: number;
+    softThreshold?: number;
+    hardThreshold?: number;
+    softMaxStrength?: number;
+    cooldownMs?: number;
+}
+export interface IAlignmentSnapAxisOptions {
+    axis: AlignmentSnapAxis;
+    value: number;
+    guide: IAlignmentSnapGuide | null;
+    now?: number;
+}
+export interface IAlignmentSnapAxisResult {
+    snapped: boolean;
+    value: number;
+    guide: IAlignmentSnapGuide | null;
+}
+export declare function normalizeAlignmentRect(rect: IAlignmentRect): IAlignmentRect;
+export declare function getAlignmentRectXAnchors(rect: IAlignmentRect): [number, number, number];
+export declare function getAlignmentRectYAnchors(rect: IAlignmentRect): [number, number, number];
+export declare function getClosestAlignmentOffset(activeAnchors: readonly number[], targetAnchors: readonly number[], threshold: number): number;
+export declare class AlignmentSnapSession {
+    private readonly _enterThreshold;
+    private readonly _exitThreshold;
+    private readonly _breakawayThreshold;
+    private readonly _softThreshold;
+    private readonly _hardThreshold;
+    private readonly _softMaxStrength;
+    private readonly _cooldownMs;
+    private _activeGuideId;
+    private _activeGuideStartValue;
+    private _releasedUntil;
+    constructor(config?: IAlignmentSnapSessionConfig);
+    reset(): void;
+    resolveAxisSnap(options: IAlignmentSnapAxisOptions): IAlignmentSnapAxisResult;
+    private _resolveSnappedValue;
+}

package/lib/types/base-object.d.ts

@@ -164,6 +164,14 @@ export declare abstract class BaseObject extends Disposable {
     isRender(bounds?: IViewportInfo): boolean | undefined;
     getParent(): any;
     getState(): ITransformState;
+    /**
+     * Returns the flip state after composing this object with every ancestor
+     * drawing group whose transform participates in rendering.
+     */
+    getEffectiveFlipState(): {
+        flipX: boolean;
+        flipY: boolean;
+    };
     getRealBound(): IGroupBaseBound;
     hide(): void;
     show(): void;

package/lib/types/basics/document-node-tools.d.ts

@@ -24,6 +24,7 @@ export declare function getParagraphByGlyph(glyph: Nullable<IDocumentSkeletonGly
     paragraphEnd: number;
     startIndex: number;
     paragraphId: string;
+    styleId?: string;
     paragraphStyle?: import("@univerjs/core").IParagraphStyle;
     bullet?: import("@univerjs/core").IBullet;
 } | undefined;

package/lib/types/basics/drawing-effect.d.ts

@@ -0,0 +1,34 @@
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import type { IGlowEffect, IShadowEffect } from '@univerjs/core';
+import type { IBoundRectNoAngle } from './vector2';
+export interface IResolvedDrawingShadow {
+    color: string;
+    blurRadius: number;
+    offsetX: number;
+    offsetY: number;
+}
+export declare function resolveOuterShadowEffect(effect: IShadowEffect | undefined): IResolvedDrawingShadow | undefined;
+export declare function resolveGlowEffect(effect: IGlowEffect | undefined): IResolvedDrawingShadow | undefined;
+/**
+ * Resolves effects painted from an off-screen alpha mask.
+ *
+ * A glow uses two centered mask passes to match PowerPoint's DrawingML glow density without repainting source content.
+ */
+export declare function resolveDrawingEffectMasks(glow: IGlowEffect | undefined, outerShadow: IShadowEffect | undefined): IResolvedDrawingShadow[];
+export declare function expandDrawingEffectBounds(bounds: IBoundRectNoAngle, glow: IGlowEffect | undefined, outerShadow: IShadowEffect | undefined): IBoundRectNoAngle;
+export declare function createDrawingEffectFilter(glow: IGlowEffect | undefined, outerShadow: IShadowEffect | undefined): string;
+export declare function combineDrawingEffectFilter(currentFilter: string, effectFilter: string): string;

package/lib/types/basics/i-document-skeleton-cached.d.ts

@@ -209,6 +209,7 @@ export interface IDocumentSkeletonGlyph {
     url?: string;
     featureId?: string;
     drawingId?: string;
+    fauxBoldStrokeWidth?: number;
 }
 export interface IDocumentSkeletonBullet {
     listId: string;
@@ -216,9 +217,13 @@ export interface IDocumentSkeletonBullet {
     ts: ITextStyle;
     fontStyle?: IDocumentSkeletonFontStyle;
     startIndexItem: number;
+    startNumber?: number;
     nestingLevel?: INestingLevel;
     bulletAlign?: BulletAlignment;
     bulletType?: boolean;
+    compactSpacing?: boolean;
+    preserveTextLineHeight?: boolean;
+    imageSource?: string;
     paragraphProperties?: IParagraphProperties;
 }
 export interface IDocumentSkeletonDrawing {
@@ -241,6 +246,8 @@ export interface IDocumentSkeletonDrawing {
         contentHeight?: number;
         contentWidth?: number;
         height?: number;
+        pageContentWidth?: number;
+        viewScale?: number;
         viewportHeight?: number;
     };
 }

package/lib/types/basics/i-events.d.ts

@@ -104,11 +104,6 @@ export interface IKeyboardEvent extends IUIEvent {
      * Status of Alt key being pressed
      */
     altKey: boolean;
-    /**
-     * Unicode value of character pressed
-     * @deprecated
-     */
-    charCode?: number;
     /**
      * Code for key based on layout
      */
@@ -121,7 +116,6 @@ export interface IKeyboardEvent extends IUIEvent {
      * String representation of key
      */
     key: string;
-    keyCode: number;
     /**
      * Status of Meta key (eg. Windows key) being pressed
      */

package/lib/types/basics/interfaces.d.ts

@@ -94,6 +94,15 @@ export interface IParagraphConfig {
     paragraphIndex: number;
     documentCompatibilityPolicy?: IDocumentCompatibilityPolicy;
     useWordStyleLineHeight?: boolean;
+    usePptxFontSizeLineHeight?: boolean;
+    usePptxNominalFontLineHeight?: boolean;
+    usePptxCompatibleLineSpacing?: boolean;
+    usePptxPercentageLineSpacing?: boolean;
+    pptxPercentageFontSize?: number;
+    usePptxNormAutofitLineHeight?: boolean;
+    pptxEmptyParagraphFontSize?: number;
+    pptxHasExplicitEndParaFontSize?: boolean;
+    sumPptxParagraphSpacing?: boolean;
     docxFallbackAnchorLeft?: IParagraphStyle['indentStart'];
     paragraphNonInlineSkeDrawings?: Map<string, IDocumentSkeletonDrawing>;
     paragraphInlineSkeDrawings?: Map<string, IDocumentSkeletonDrawing>;

package/lib/types/basics/tools.d.ts

@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { ICellInfo, ICellWithCoord, IPosition, IRange, IRangeWithCoord, IScale, IStyleBase, Nullable } from '@univerjs/core';
+import type { IPosition, IRange, IRangeWithCoord, IScale, IStyleBase, Nullable } from '@univerjs/core';
 import type { IDocumentSkeletonFontStyle } from './i-document-skeleton-cached';
 import type { IBoundRectNoAngle } from './vector2';
+export declare function hasScrollableOverflow(contentSize: number, viewportSize: number): boolean;
 export declare const getColor: (RgbArray: number[], opacity?: number) => string;
 export declare const toPx: (num: number | string, ReferenceValue: Nullable<number>) => number;
 /**
@@ -80,27 +81,6 @@ export declare function ptToMM(px: number): number;
 export declare function pxToInch(px: number): number;
 export declare function getScale(parentScale: IScale): number;
 export declare function getCellPositionByIndex(row: number, column: number, rowHeightAccumulation: number[], columnWidthAccumulation: number[]): IPosition;
-/**
- * @deprecated use same function in @univerjs/core
- * @description Get the cell position information of the specified row and column, including the position information of the cell and the merge information of the cell
- * @param {number} row The row index of the cell
- * @param {number} column The column index of the cell
- * @param {number[]} rowHeightAccumulation The accumulated height of each row
- * @param {number[]} columnWidthAccumulation The accumulated width of each column
- * @param {ICellInfo} mergeDataInfo The merge information of the cell
- * @returns {ICellWithCoord} The cell position information of the specified row and column, including the position information of the cell and the merge information of the cell
- */
-declare function getCellWithCoordByIndexCore(row: number, column: number, rowHeightAccumulation: number[], columnWidthAccumulation: number[], mergeDataInfo: ICellInfo): ICellWithCoord;
-/**
- * @deprecated please use getCellWithCoordByIndexCore in @univerjs/core instead
- */
-declare const getCellByIndexWithMergeInfo: typeof getCellWithCoordByIndexCore;
-export { getCellByIndexWithMergeInfo };
-/**
- * Determine whether there are any cells in a row that are not in the merged cells, mainly used for the calculation of auto height
- * @deprecated please use SpreadsheetSkeleton@_hasUnMergedCellInRow
- */
-export declare function hasUnMergedCellInRow(row: number, startColumn: number, endColumn: number, mergeData: IRange[]): boolean;
 export declare function mergeInfoOffset(mergeInfo: IRangeWithCoord, offsetX: number, offsetY: number): {
     startY: number;
     endY: number;

package/lib/types/components/docs/custom-block-render-viewport.d.ts

@@ -29,6 +29,8 @@ export interface IDocsCustomBlockRenderViewport {
     height: number;
     layoutWidth?: number;
     offsetLeft?: number;
+    pageContentWidth?: number;
+    viewScale?: number;
     viewportHeight?: number;
     width: number;
 }

package/lib/types/components/docs/document.d.ts

@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 import type { Nullable } from '@univerjs/core';
-import type { IDocumentSkeletonPage } from '../../basics/i-document-skeleton-cached';
+import type { IDocumentSkeletonPage, IDocumentSkeletonSection } from '../../basics/i-document-skeleton-cached';
 import type { Transform } from '../../basics/transform';
 import type { IViewportInfo } from '../../basics/vector2';
 import type { UniverRenderingContext } from '../../context';
 import type { IDocumentsConfig, IPageMarginLayout } from './doc-component';
 import type { DocumentSkeleton } from './layout/doc-skeleton';
+import { Vector2 } from '../../basics/vector2';
 import { DocComponent } from './doc-component';
 import './extensions';
 export interface IPageRenderConfig {
@@ -33,6 +34,7 @@ export interface IDocumentOffsetConfig extends IPageMarginLayout {
     docsTop: number;
     documentTransform: Transform;
 }
+export declare function drawSectionColumnSeparators(ctx: UniverRenderingContext, section: IDocumentSkeletonSection, height: number, offsetX?: number, offsetY?: number): void;
 export declare class Documents extends DocComponent {
     private readonly _pageRender$;
     readonly pageRender$: import("rxjs").Observable<IPageRenderConfig>;
@@ -42,6 +44,7 @@ export declare class Documents extends DocComponent {
     dispose(): void;
     getOffsetConfig(): IDocumentOffsetConfig;
     getEngine(): Nullable<import("../..").Engine>;
+    isHit(coord: Vector2): boolean;
     changeSkeleton(newSkeleton: DocumentSkeleton): this;
     protected _draw(ctx: UniverRenderingContext, bounds?: IViewportInfo): void;
     draw(ctx: UniverRenderingContext, bounds?: IViewportInfo): void;

package/lib/types/components/docs/extensions/line.d.ts

@@ -15,17 +15,21 @@
  */
 import type { IScale } from '@univerjs/core';
 import type { IDocumentSkeletonGlyph } from '../../../basics/i-document-skeleton-cached';
+import type { IBoundRectNoAngle } from '../../../basics/vector2';
 import type { UniverRenderingContext } from '../../../context';
+import type { IDrawInfo } from '../../extension';
 import { docExtension } from '../doc-extension';
 export declare class Line extends docExtension {
     uKey: string;
     Z_INDEX: number;
     private _preBackgroundColor;
-    draw(ctx: UniverRenderingContext, parentScale: IScale, glyph: IDocumentSkeletonGlyph): void;
+    draw(ctx: UniverRenderingContext, parentScale: IScale, glyph: IDocumentSkeletonGlyph, _diff?: IBoundRectNoAngle, more?: IDrawInfo): void;
     clearCache(): void;
     private _drawLine;
     private _drawLineTo;
     private _setLineType;
     private _isWave;
     private _isDouble;
+    private _isAccounting;
+    private _isFirstAccountingGlyph;
 }

package/lib/types/components/docs/layout/block/paragraph/bullet.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { IBullet, ILists, LocaleService, Nullable } from '@univerjs/core';
+import type { IBullet, ILists, ITextStyle, LocaleService, Nullable } from '@univerjs/core';
 import type { IDocumentSkeletonBullet } from '../../../../../basics/i-document-skeleton-cached';
-export declare function dealWithBullet(bullet?: IBullet, lists?: ILists, listLevelAncestors?: Array<Nullable<IDocumentSkeletonBullet>>, localeService?: LocaleService): IDocumentSkeletonBullet | undefined;
+export declare function dealWithBullet(bullet?: IBullet, lists?: ILists, listLevelAncestors?: Array<Nullable<IDocumentSkeletonBullet>>, localeService?: LocaleService, compactSpacing?: boolean, paragraphTextStyle?: ITextStyle): IDocumentSkeletonBullet | undefined;
 export declare function getDefaultBulletSke(listId: string, startIndex?: number): IDocumentSkeletonBullet;

package/lib/types/components/docs/layout/block/paragraph/layout-ruler.d.ts

@@ -18,7 +18,7 @@ import type { IParagraphConfig, IParagraphTableCache, ISectionBreakConfig } from
 import type { IFloatObject, ILayoutContext } from '../../tools';
 import { BooleanNumber, GridType, SpacingRule } from '@univerjs/core';
 import { BreakPointType } from '../../line-breaker/break';
-declare function isGlyphGroupBeyondDivideWidth(glyphGroup: IDocumentSkeletonGlyph[], offsetLeft: number, divideWidth: number): boolean;
+declare function isGlyphGroupBeyondDivideWidth(glyphGroup: IDocumentSkeletonGlyph[], offsetLeft: number, divideWidth: number, hangingPunctuation?: boolean): boolean;
 export declare function layoutParagraph(ctx: ILayoutContext, glyphGroup: IDocumentSkeletonGlyph[], pages: IDocumentSkeletonPage[], sectionBreakConfig: ISectionBreakConfig, paragraphConfig: IParagraphConfig, isParagraphFirstShapedText: boolean, breakPointType?: BreakPointType): IDocumentSkeletonPage[];
 declare function __avoidFlowAffectingDrawingsForTable(table: IDocumentSkeletonTable, page: IDocumentSkeletonPage, column: IDocumentSkeletonColumn): void;
 declare function _updateAndPositionTable(ctx: ILayoutContext, lineTop: number, lineHeight: number, page: IDocumentSkeletonPage, column: IDocumentSkeletonColumn, section: IDocumentSkeletonSection, skeTablesInParagraph: IParagraphTableCache[], paragraphIndex: number, sectionBreakConfig: ISectionBreakConfig, drawingAnchorTop?: number): boolean;

package/lib/types/components/docs/layout/block/paragraph/shaping.d.ts

@@ -24,4 +24,4 @@ export interface IShapedText {
     glyphs: IDocumentSkeletonGlyph[];
     breakPointType: BreakPointType;
 }
-export declare function shaping(ctx: ILayoutContext, content: string, viewModel: DocumentViewModel, paragraphNode: DataStreamTreeNode, sectionBreakConfig: ISectionBreakConfig, useOpenType?: boolean): IShapedText[];
+export declare function shaping(ctx: ILayoutContext, content: string, viewModel: DocumentViewModel, paragraphNode: DataStreamTreeNode, sectionBreakConfig: ISectionBreakConfig): IShapedText[];

package/lib/types/components/docs/layout/doc-no-wrap-measure.d.ts

@@ -27,6 +27,11 @@ export declare function measureDocumentNoWrapTextRangeWidth(documentData: IDocum
  * details such as CJK-Latin spacing.
  */
 export declare function measureDocumentNoWrapTextWidth(documentData: IDocumentData | null | undefined): number;
+/**
+ * Measures the widest line after applying the docs Unicode break policy
+ * within a fixed-width host.
+ */
+export declare function measureDocumentWrappedTextWidth(documentData: IDocumentData | null | undefined, maxLineWidth: number): number;
 /**
  * Measures the widest segment that docs line breaking keeps together. This is
  * useful when a host may wrap normally but still needs enough width to avoid

package/lib/types/components/docs/layout/doc-skeleton.d.ts

@@ -18,6 +18,7 @@ import type { IDocumentSkeletonCached, IDocumentSkeletonGlyph, IDocumentSkeleton
 import type { INodeInfo, INodePosition, INodeSearch } from '../../../basics/interfaces';
 import type { IViewportInfo, Vector2 } from '../../../basics/vector2';
 import type { DocumentViewModel } from '../view-model/document-view-model';
+import type { IDocumentPaginationMetrics } from './tools';
 import { Skeleton } from '@univerjs/core';
 import { PageLayoutType } from '../../../basics/i-document-skeleton-cached';
 import { DocumentEditArea } from '../view-model/document-view-model';
@@ -42,6 +43,7 @@ export declare class DocumentSkeleton extends Skeleton {
     private _languageDetector;
     private _iteratorCount;
     private _initialWidth;
+    private _paginationMetrics;
     constructor(_docViewModel: DocumentViewModel, localeService: LocaleService);
     static create(docViewModel: DocumentViewModel, localeService: LocaleService): DocumentSkeleton;
     dispose(): void;
@@ -52,6 +54,11 @@ export declare class DocumentSkeleton extends Skeleton {
      */
     calculate(bounds?: IViewportInfo): void;
     getSkeletonData(): Nullable<IDocumentSkeletonCached>;
+    /**
+     * Returns a cloned snapshot of the most recent layout's bounded pagination counters.
+     * These diagnostics describe renderer work and are not part of the document model.
+     */
+    getPaginationMetrics(): Nullable<IDocumentPaginationMetrics>;
     resetInitialWidth(): void;
     getActualSize(): {
         actualWidth: number;
@@ -104,6 +111,7 @@ export declare class DocumentSkeleton extends Skeleton {
      */
     private _createSkeleton;
     private _addNewSectionByContinuous;
+    private _addNewSectionByNextColumn;
     private _restoreContinuousSection;
     private _findNodeByIndex;
 }

package/lib/types/components/docs/layout/line-breaker/enhancers/hyphen-enhancer.d.ts

@@ -16,7 +16,7 @@
 import type { Nullable } from '@univerjs/core';
 import type { Hyphen } from '../../hyphenation/hyphen';
 import type { Lang } from '../../hyphenation/lang';
-import type { IBreakPoints, LineBreaker } from '../line-breaker';
+import type { IBreakPoints } from '../line-breaker';
 import { Break } from '../break';
 export declare class LineBreakerHyphenEnhancer implements IBreakPoints {
     private _lineBreaker;
@@ -30,6 +30,6 @@ export declare class LineBreakerHyphenEnhancer implements IBreakPoints {
     private _hyphenIndex;
     private _hyphenSlice;
     content: string;
-    constructor(_lineBreaker: LineBreaker, _hyphen: Hyphen, _lang: Lang, _doNotHyphenateCaps?: boolean);
+    constructor(_lineBreaker: IBreakPoints, _hyphen: Hyphen, _lang: Lang, _doNotHyphenateCaps?: boolean);
     nextBreakPoint(): Nullable<Break>;
 }

package/lib/types/components/docs/layout/line-breaker/enhancers/link-enhancer.d.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import type { Nullable } from '@univerjs/core';
-import type { IBreakPoints, LineBreaker } from '../line-breaker';
+import type { IBreakPoints } from '../line-breaker';
 import { Break } from '../break';
 export declare class LineBreakerLinkEnhancer implements IBreakPoints {
     private _lineBreaker;
@@ -25,6 +25,6 @@ export declare class LineBreakerLinkEnhancer implements IBreakPoints {
     private _index;
     private _linkSlice;
     content: string;
-    constructor(_lineBreaker: LineBreaker);
+    constructor(_lineBreaker: IBreakPoints);
     nextBreakPoint(): Nullable<Break>;
 }

package/lib/types/components/docs/layout/line-breaker/enhancers/whole-entity-enhancer.d.ts

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import type { ICustomRange, Nullable } from '@univerjs/core';
+import type { Break } from '../break';
+import type { IBreakPoints } from '../line-breaker';
+/**
+ * Removes line-break opportunities from the interior of measured whole
+ * entities. The model keeps the entity's complete source text, while shaping
+ * treats the inclusive custom range as one unbreakable inline object.
+ */
+export declare class LineBreakerWholeEntityEnhancer implements IBreakPoints {
+    private readonly _lineBreaker;
+    private readonly _contentStartIndex;
+    readonly content: string;
+    private readonly _ranges;
+    private _rangeIndex;
+    constructor(_lineBreaker: IBreakPoints, ranges: readonly ICustomRange[], _contentStartIndex: number);
+    nextBreakPoint(): Nullable<Break>;
+    private _isInsideWholeEntity;
+}

package/lib/types/{basics/unit-convert.d.ts → components/docs/layout/line-breaker/extensions/east-asian-quote-linebreak-extension.d.ts}

@@ -13,5 +13,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-declare const whiteListKeyForPt: Set<string>;
-declare function isNotEmpty(value: unknown): boolean;
+import type { LineBreaker } from '../line-breaker';
+export declare function eastAsianQuoteLineBreakExtension(breaker: LineBreaker): void;

package/lib/types/components/docs/layout/line-breaker/line-breaker.d.ts

@@ -20,6 +20,7 @@ interface ILineBreakExtension {
     (breaker: LineBreaker): void;
 }
 export interface IBreakPoints {
+    readonly content: string;
     nextBreakPoint(): Nullable<Break>;
 }
 export declare class LineBreaker implements IBreakPoints {

package/lib/types/components/docs/layout/model/glyph.d.ts

@@ -15,7 +15,6 @@
  */
 import type { IAdjustability, IDocumentSkeletonBullet, IDocumentSkeletonDivide, IDocumentSkeletonGlyph } from '../../../../basics/i-document-skeleton-cached';
 import type { IFontCreateConfig } from '../../../../basics/interfaces';
-import type { IOpenTypeGlyphInfo } from '../shaping-engine/text-shaping';
 import { GlyphType } from '../../../../basics/i-document-skeleton-cached';
 export declare function isSpace(char: string): boolean;
 export declare function isJustifiable(content: string): boolean;
@@ -25,11 +24,24 @@ export declare function createSkeletonLetterGlyph(content: string, config: IFont
     ascent?: number;
     descent?: number;
     width?: number;
-}, glyphInfo?: IOpenTypeGlyphInfo): IDocumentSkeletonGlyph;
+}): IDocumentSkeletonGlyph;
+/**
+ * Creates one non-text skeleton glyph for a whole entity whose source spans
+ * multiple model characters. `raw` and `count` retain the source mapping.
+ *
+ * The zero-width marker keeps the glyph in the document paint loop so a
+ * component extension can render the entity, without painting its model
+ * source as ordinary text.
+ */
+export declare function createSkeletonWholeEntityGlyph(raw: string, config: IFontCreateConfig, glyphMetrics: {
+    ascent?: number;
+    descent?: number;
+    width?: number;
+}): IDocumentSkeletonGlyph;
 export declare function createSkeletonTabGlyph(config: IFontCreateConfig, glyphWidth?: number): IDocumentSkeletonGlyph;
 export declare function createHyphenDashGlyph(config: IFontCreateConfig): IDocumentSkeletonGlyph;
 export declare function createSkeletonCustomBlockGlyph(config: IFontCreateConfig, glyphWidth?: number, glyphHeight?: number, drawingId?: string): IDocumentSkeletonGlyph;
-export declare function _createSkeletonWordOrLetter(glyphType: GlyphType, content: string, config: IFontCreateConfig, glyphWidth?: number, glyphInfo?: IOpenTypeGlyphInfo): IDocumentSkeletonGlyph;
+export declare function _createSkeletonWordOrLetter(glyphType: GlyphType, content: string, config: IFontCreateConfig, glyphWidth?: number): IDocumentSkeletonGlyph;
 export declare function createSkeletonBulletGlyph(glyph: IDocumentSkeletonGlyph, bulletSkeleton: IDocumentSkeletonBullet, charSpaceApply: number): IDocumentSkeletonGlyph;
 export declare function setGlyphGroupLeft(glyphGroup: IDocumentSkeletonGlyph[], left?: number): void;
 export declare function setGlyphLeft(glyph: IDocumentSkeletonGlyph, left?: number): void;

package/lib/types/components/docs/layout/shaping-engine/font-cache.d.ts

@@ -15,7 +15,6 @@
  */
 import type { Nullable } from '@univerjs/core';
 import type { IDocumentSkeletonBoundingBox, IDocumentSkeletonFontStyle } from '../../../../basics/i-document-skeleton-cached';
-import type { IOpenTypeGlyphInfo } from './text-shaping';
 export declare const DEFAULT_MEASURE_TEXT = "0";
 export interface IMeasureTextCache {
     fontBoundingBoxAscent: number;
@@ -45,18 +44,6 @@ export declare class FontCache {
         height: number;
     };
     static getTextSize(content: string, fontStyle: IDocumentSkeletonFontStyle): IDocumentSkeletonBoundingBox;
-    static getBBoxFromGlyphInfo(glyphInfo: IOpenTypeGlyphInfo, fontStyle: IDocumentSkeletonFontStyle): {
-        width: number;
-        ba: number;
-        bd: number;
-        aba: number;
-        abd: number;
-        sp: number;
-        sbr: number;
-        spr: number;
-        sbo: number;
-        spo: number;
-    };
     /**
      * Measure text on another canvas.
      * @param content

package/lib/types/components/docs/layout/tools.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { DocumentDataModel, INumberUnit, IObjectPositionH, IObjectPositionV, IParagraph, IParagraphStyle, ITextStyle, Nullable, PositionedObjectLayoutType } from '@univerjs/core';
+import type { DocumentDataModel, ICustomRangeForInterceptor, INumberUnit, IObjectPositionH, IObjectPositionV, IParagraph, IParagraphStyle, ITextStyle, Nullable, PositionedObjectLayoutType } from '@univerjs/core';
 import type { IDocumentSkeletonCached, IDocumentSkeletonColumn, IDocumentSkeletonDivide, IDocumentSkeletonFontStyle, IDocumentSkeletonGlyph, IDocumentSkeletonLine, IDocumentSkeletonPage, IDocumentSkeletonRow, IDocumentSkeletonSection, IDocumentSkeletonTable, ISkeletonResourceReference } from '../../../basics/i-document-skeleton-cached';
 import type { IDocsConfig, IParagraphConfig, ISectionBreakConfig } from '../../../basics/interfaces';
 import type { IBoundRectNoAngle } from '../../../basics/vector2';
@@ -120,6 +120,7 @@ export interface IDocumentSkeletonTableContext {
     tableRect: IBoundRectNoAngle;
 }
 export interface IDocumentSkeletonTableIteratorOptions {
+    includeCells?: boolean;
     docsLeft?: number;
     docsTop?: number;
     pageMarginTop?: number;
@@ -171,11 +172,25 @@ export declare function getFontConfigFromLastGlyph(glyph: IDocumentSkeletonGlyph
 };
 export declare function getFontCreateConfig(index: number, viewModel: DocumentViewModel, paragraphNode: DataStreamTreeNode, sectionBreakConfig: ISectionBreakConfig, paragraph: IParagraph): IFontCreateConfig;
 export declare function getCustomRangeGlyphWidth(index: number, viewModel: DocumentViewModel, paragraphNode: DataStreamTreeNode, config: IFontCreateConfig): number | undefined;
+/**
+ * Returns whether a custom range should occupy one measured glyph in the
+ * document skeleton while preserving its complete source text in the model.
+ *
+ * Visible whole-entity ranges such as mentions keep their existing shaping.
+ * The atomic behavior is reserved for hidden ranges whose renderer provides
+ * explicit glyph metrics, such as an inline formula.
+ */
+export declare function isMeasuredWholeEntityRange(customRange: Nullable<ICustomRangeForInterceptor>): customRange is ICustomRangeForInterceptor;
 export declare function getCustomRangeGlyphMetrics(index: number, viewModel: DocumentViewModel, paragraphNode: DataStreamTreeNode, config: IFontCreateConfig): {
     ascent?: number;
     descent?: number;
     width?: number;
 } | undefined;
+export declare function getCustomRangeGlyphMetricsFromRange(customRange: ICustomRangeForInterceptor, config: IFontCreateConfig): {
+    ascent?: number;
+    descent?: number;
+    width?: number;
+} | undefined;
 export declare function getNullSkeleton(): IDocumentSkeletonCached;
 export declare function setPageParent(pages: IDocumentSkeletonPage[], parent: IDocumentSkeletonCached): void;
 export declare enum FloatObjectType {
@@ -194,6 +209,22 @@ export interface IFloatObject {
     type: FloatObjectType;
     positionV: IObjectPositionV;
 }
+export interface IDocumentPaginationMetrics {
+    /** Paragraphs that entered the Word-compatible pagination decision path. */
+    constrainedParagraphs: number;
+    /** Paragraphs that stayed on the no-constraint fast path. */
+    noConstraintParagraphs: number;
+    /** Already-shaped lines inspected by pagination checkpoints. */
+    measuredLineCount: number;
+    /** Bounded local pagination adjustments; at most one per paragraph or keep chain. */
+    retryCount: number;
+    /** Already-shaped lines moved by a pagination adjustment. */
+    movedLineCount: number;
+    /** Paragraphs inspected while walking backward through keep-next chains. */
+    keepNextScanCount: number;
+    /** Largest number of line references retained by one local checkpoint. */
+    peakCheckpointLineCount: number;
+}
 export interface ILayoutContext {
     viewModel: DocumentViewModel;
     dataModel: DocumentDataModel;
@@ -210,6 +241,7 @@ export interface ILayoutContext {
     paragraphConfigCache: Map<string, Map<number, IParagraphConfig>>;
     sectionBreakConfigCache: Map<number, ISectionBreakConfig>;
     paragraphsOpenNewPage: Set<number>;
+    paginationMetrics?: IDocumentPaginationMetrics;
     hyphen: Hyphen;
     languageDetector: LanguageDetector;
 }

package/lib/types/components/docs/table-render-viewport.d.ts

@@ -18,10 +18,12 @@ export interface IDocsTableRenderViewport {
     leadingInsetLeft?: number;
     scrollLeft: number;
     trailingInsetRight?: number;
+    viewportLeft?: number;
     viewportWidth: number;
 }
 export type DocsTableRenderViewportProvider = (unitId: string, tableId: string) => IDocsTableRenderViewport | null | undefined;
 export declare function setDocsTableRenderViewportProvider(provider: DocsTableRenderViewportProvider | null): void;
 export declare function getDocsTableRenderViewport(unitId: string, tableId: string): IDocsTableRenderViewport | null;
 export declare function getDocsTableVirtualContentWidth(viewport: IDocsTableRenderViewport): number;
+export declare function getDocsTableViewportLeft(viewport: IDocsTableRenderViewport | null | undefined, fallbackLeft: number, docsLeft?: number): number;
 export declare function hasDocsTableHorizontalViewport(viewport: IDocsTableRenderViewport | null | undefined): viewport is IDocsTableRenderViewport;

package/lib/types/components/sheets/index.d.ts

@@ -21,4 +21,6 @@ export * from './row-header';
 export * from './sheet-component';
 export * from './sheet.render-skeleton';
 export * from './spreadsheet';
+export { calculateCellImageRect } from './util';
+export type { ICellImageRectConfig } from './util';
 export * from './watermark';