@univerjs/engine-render 1.0.0-rc.0 → 1.0.1

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

@@ -18,6 +18,7 @@ import type { IBreakPoints } from '../line-breaker';
 import { Break } from '../break';
 export declare class LineBreakerLinkEnhancer implements IBreakPoints {
     private _lineBreaker;
+    private readonly _allowLinkBreaks;
     private _curBreak;
     private _nextBreak;
     private _isInLink;
@@ -25,6 +26,6 @@ export declare class LineBreakerLinkEnhancer implements IBreakPoints {
     private _index;
     private _linkSlice;
     content: string;
-    constructor(_lineBreaker: IBreakPoints);
+    constructor(_lineBreaker: IBreakPoints, _allowLinkBreaks?: boolean);
     nextBreakPoint(): Nullable<Break>;
 }

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

@@ -13,12 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { IAdjustability, IDocumentSkeletonBullet, IDocumentSkeletonDivide, IDocumentSkeletonGlyph } from '../../../../basics/i-document-skeleton-cached';
+import type { IAdjustability, IDocumentSkeletonBullet, IDocumentSkeletonDivide, IDocumentSkeletonFontStyle, IDocumentSkeletonGlyph } from '../../../../basics/i-document-skeleton-cached';
 import type { IFontCreateConfig } from '../../../../basics/interfaces';
+import type { IDocumentCompatibilityPolicy } from '../../document-compatibility';
 import { GlyphType } from '../../../../basics/i-document-skeleton-cached';
 export declare function isSpace(char: string): boolean;
+export declare function getGlyphGroupFontBoundingBox(policy: IDocumentCompatibilityPolicy | undefined, ...glyphGroups: IDocumentSkeletonGlyph[][]): {
+    boundingBoxAscent: number;
+    boundingBoxDescent: number;
+    normalLineHeight: number;
+};
+export declare function getTextHorizontalScale(percent?: number): number;
 export declare function isJustifiable(content: string): boolean;
-export declare function baseAdjustability(content: string, width: number): IAdjustability;
+export declare function baseAdjustability(content: string, width: number, emWidth?: number): IAdjustability;
+export declare function getGlyphGroupStretchability(glyphGroup: IDocumentSkeletonGlyph[]): number;
+export declare function getGlyphGroupShrinkability(glyphGroup: IDocumentSkeletonGlyph[], punctuationOnly?: boolean): number;
 export declare function createSkeletonWordGlyph(content: string, config: IFontCreateConfig, glyphWidth?: number): IDocumentSkeletonGlyph;
 export declare function createSkeletonLetterGlyph(content: string, config: IFontCreateConfig, glyphMetrics?: number | {
     ascent?: number;
@@ -41,10 +50,25 @@ export declare function createSkeletonWholeEntityGlyph(raw: string, config: IFon
 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): IDocumentSkeletonGlyph;
-export declare function createSkeletonBulletGlyph(glyph: IDocumentSkeletonGlyph, bulletSkeleton: IDocumentSkeletonBullet, charSpaceApply: number): IDocumentSkeletonGlyph;
+export declare function getPairKerningAdjustment(left: string, right: string, font: IDocumentSkeletonFontStyle): number;
+export declare function applyGlyphKerning(glyphs: IDocumentSkeletonGlyph[]): void;
+export declare function getGlyphPairKerningAdjustment(left?: IDocumentSkeletonGlyph, right?: IDocumentSkeletonGlyph): number;
+/** Shared by skeleton layout and lightweight host measurement; offsets also drive painting. */
+export declare function measureTextWithCharacterSpacing(content: string, spacing: number | undefined, measure: (text: string) => number, pairAdjustment?: (left: string, right: string) => number): {
+    content: string;
+    width: number;
+    inkWidth: number;
+    segments: Array<{
+        content: string;
+        left: number;
+    }>;
+} | undefined;
+export declare function _createSkeletonWordOrLetter(glyphType: GlyphType, raw: string, config: IFontCreateConfig, glyphWidth?: number): IDocumentSkeletonGlyph;
+export declare function createSkeletonBulletGlyph(glyph: IDocumentSkeletonGlyph, bulletSkeleton: IDocumentSkeletonBullet, charSpaceApply: number, documentCompatibilityPolicy?: IDocumentCompatibilityPolicy): IDocumentSkeletonGlyph;
 export declare function setGlyphGroupLeft(glyphGroup: IDocumentSkeletonGlyph[], left?: number): void;
 export declare function setGlyphLeft(glyph: IDocumentSkeletonGlyph, left?: number): void;
 export declare function addGlyphToDivide(divide: IDocumentSkeletonDivide, glyphGroup: IDocumentSkeletonGlyph[], offsetLeft?: number): void;
+export declare function removeGlyphAutoSpacing(glyph: IDocumentSkeletonGlyph, side: 0 | 1): void;
 export declare function glyphShrinkRight(glyph: IDocumentSkeletonGlyph, amount: number): void;
 export declare function glyphShrinkLeft(glyph: IDocumentSkeletonGlyph, amount: number): void;
+export declare function preserveLineStartPunctuationSpace(glyph: IDocumentSkeletonGlyph): void;

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

@@ -13,18 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { IDocumentBody, ITable, Nullable } from '@univerjs/core';
+import type { IDocumentBody, ITable, ITableCellBorder, ITableRow, Nullable } from '@univerjs/core';
 import type { IDocumentSkeletonPage, ISkeletonResourceReference } from '../../../../basics/i-document-skeleton-cached';
 import type { ISectionBreakConfig } from '../../../../basics/interfaces';
 import type { DataStreamTreeNode } from '../../view-model/data-stream-tree-node';
 import type { DocumentViewModel } from '../../view-model/document-view-model';
 import type { ILayoutContext } from '../tools';
 import { BreakType } from '../../../../basics/i-document-skeleton-cached';
-export declare function createSkeletonPage(ctx: ILayoutContext, sectionBreakConfig: ISectionBreakConfig, skeletonResourceReference: ISkeletonResourceReference, pageNumber?: number, breakType?: BreakType): IDocumentSkeletonPage;
+export declare function createSkeletonPage(ctx: ILayoutContext, sectionBreakConfig: ISectionBreakConfig, skeletonResourceReference: ISkeletonResourceReference, pageNumber?: number, breakType?: BreakType, pageContext?: Pick<IDocumentSkeletonPage, 'type' | 'segmentId'>): IDocumentSkeletonPage;
 export declare function createNullCellPage(ctx: ILayoutContext, sectionBreakConfig: ISectionBreakConfig, tableConfig: ITable, row: number, col: number, availableHeight?: number, maxCellPageHeight?: number, inheritDocumentLinePitch?: boolean, enableDocumentTableLineGrid?: boolean, cellPageHeights?: readonly number[]): {
     page: IDocumentSkeletonPage;
     sectionBreakConfig: ISectionBreakConfig;
+    verticalCellWidth: number | undefined;
 };
+export declare function getCellBorderWidth(border: ITableCellBorder | undefined): number;
+export declare function getRowBorderInset(row: ITableRow, edge: 'borderTop' | 'borderBottom', tableBoundary?: boolean): number;
 export declare function createSkeletonCellPages(ctx: ILayoutContext, viewModel: DocumentViewModel, cellNode: DataStreamTreeNode, sectionBreakConfig: ISectionBreakConfig, tableConfig: ITable, row: number, col: number, availableHeight?: number, maxCellPageHeight?: number, cellPageHeights?: readonly number[]): IDocumentSkeletonPage[];
 export interface ICellSkeletonBuildState {
     ctx: ILayoutContext;
@@ -34,6 +37,7 @@ export interface ICellSkeletonBuildState {
     sectionBreakConfig: ISectionBreakConfig;
     cellSectionBreakConfig: ISectionBreakConfig;
     tableConfig: ITable;
+    verticalCellWidth?: number;
     paragraphIndex: number;
     layoutAnchor: Nullable<number>;
     pages: IDocumentSkeletonPage[];

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

@@ -52,14 +52,14 @@ export declare class FontCache {
     /** Transfers browser-only normal spacing measurements to the document layout Worker. */
     static getNormalLineHeightCache(): Record<string, number>;
     static setNormalLineHeightCache(metrics: Record<string, number>): void;
-    static getTextSize(content: string, fontStyle: IDocumentSkeletonFontStyle, includeNormalFontLeading?: boolean): IDocumentSkeletonBoundingBox;
+    static getTextSize(content: string, fontStyle: IDocumentSkeletonFontStyle, includeNormalFontLeading?: boolean, useUnhintedMetrics?: boolean): IDocumentSkeletonBoundingBox;
     /**
      * Measure text on another canvas.
      * @param content
      * @param fontString
      * @returns IMeasureTextCache
      */
-    static getMeasureText(content: string, fontString: string): IMeasureTextCache;
+    static getMeasureText(content: string, fontString: string, kerning?: CanvasFontKerning): IMeasureTextCache;
     private static _createMeasureContext;
     private static _getFontSizeFromStyle;
     private static _clearMeasureCache;

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

@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { DocumentDataModel, ICustomRangeForInterceptor, INumberUnit, IObjectPositionH, IObjectPositionV, IParagraph, IParagraphStyle, ITextStyle, Nullable, PositionedObjectLayoutType } from '@univerjs/core';
+import type { DocumentDataModel, ICustomRangeForInterceptor, IDocDrawingBase, INumberUnit, IObjectPositionH, IObjectPositionV, Nullable, PositionedObjectLayoutType } from '@univerjs/core';
 import type { IDocumentSkeletonCached, IDocumentSkeletonColumn, IDocumentSkeletonDivide, IDocumentSkeletonFontStyle, IDocumentSkeletonGlyph, IDocumentSkeletonLine, IDocumentSkeletonPage, IDocumentSkeletonParagraphBorders, IDocumentSkeletonRow, IDocumentSkeletonSection, IDocumentSkeletonTable, ISkeletonResourceReference } from '../../../basics/i-document-skeleton-cached';
 import type { IDocsConfig, IParagraphConfig, ISectionBreakConfig } from '../../../basics/interfaces';
 import type { IBoundRectNoAngle } from '../../../basics/vector2';
 import type { IDocumentCompatibilityPolicy } from '../document-compatibility';
+import type { IDocumentLayoutParagraph, IDocumentLayoutParagraphStyle, IDocumentLayoutTextStyle } from '../document-layout-presentation';
 import type { DataStreamTreeNode } from '../view-model/data-stream-tree-node';
 import type { DocumentViewModel } from '../view-model/document-view-model';
 import type { DocumentEndnoteLayout } from './endnote-layout';
@@ -70,7 +71,10 @@ export declare function getCharSpaceConfig(sectionBreakConfig: ISectionBreakConf
     gridType: GridType;
     snapToGrid: BooleanNumber;
 };
+export declare function getLineMetricGlyphs(glyphGroup: IDocumentSkeletonGlyph[], documentCompatibilityPolicy?: IDocumentCompatibilityPolicy, previousGlyphs?: IDocumentSkeletonGlyph[]): IDocumentSkeletonGlyph[];
+export declare function getDrawingMLLineBaseline(lineHeight: number, ascent: number, descent: number): number;
 export declare function updateBlockIndex(pages: IDocumentSkeletonPage[], start?: number, documentCompatibilityPolicy?: IDocumentCompatibilityPolicy): void;
+export declare function isParagraphEnd(line: IDocumentSkeletonLine): boolean;
 export declare function hasSameParagraphBorderSet(first: IDocumentSkeletonParagraphBorders, second: IDocumentSkeletonParagraphBorders): boolean;
 export declare function updateInlineDrawingCoordsAndBorder(ctx: ILayoutContext, pages: IDocumentSkeletonPage[]): void;
 export declare function updateParagraphBorders(ctx: ILayoutContext, pages: IDocumentSkeletonPage[], targetPages?: IDocumentSkeletonPage[]): void;
@@ -98,7 +102,7 @@ export interface IDocumentSkeletonLineContext {
     visualLeft?: number;
     visualWidth?: number;
 }
-export type DocumentSkeletonTableSource = 'page' | 'column' | 'header' | 'footer';
+export type DocumentSkeletonTableSource = 'page' | 'table-cell' | 'column' | 'header' | 'footer';
 type HeaderFooterSkeletonMap = Map<string, Map<number, IDocumentSkeletonPage>>;
 export interface IDocumentSkeletonTableCellGeometry {
     cell: IDocumentSkeletonPage;
@@ -158,27 +162,29 @@ export declare function compareDocumentSkeletonNestedPagePathOrder(pos1: {
 export declare function columnIterator(pages: IDocumentSkeletonPage[], iteratorFunction: (column: IDocumentSkeletonColumn) => void): void;
 export declare function getPositionHorizon(positionH: IObjectPositionH, column: IDocumentSkeletonColumn, page: IDocumentSkeletonPage, objectWidth: number, isPageBreak?: boolean): number | undefined;
 export declare function getPositionVertical(positionV: IObjectPositionV, page: IDocumentSkeletonPage, lineTop: number, lineHeight: number, objectHeight: number, blockAnchorTop?: number, isPageBreak?: boolean): number | undefined;
-export declare function getGlyphGroupWidth(divide: IDocumentSkeletonDivide): number;
+export declare function getGlyphGroupWidth(divide: IDocumentSkeletonDivide, excludeTrailingSpaces?: boolean): number;
 interface IFontCreateConfig {
     documentCompatibilityPolicy?: IDocumentCompatibilityPolicy;
     fontStyle: IDocumentSkeletonFontStyle;
-    textStyle: ITextStyle;
+    textStyle: IDocumentLayoutTextStyle;
     charSpace: number;
     gridType: GridType;
     snapToGrid: BooleanNumber;
     pageWidth: number;
+    balanceSingleByteDoubleByteWidth?: BooleanNumber;
 }
 export declare function clearFontCreateConfigCache(): void;
-export declare function getFontConfigFromLastGlyph(glyph: IDocumentSkeletonGlyph, sectionBreakConfig: ISectionBreakConfig, paragraphStyle: IParagraphStyle): {
+export declare function getFontConfigFromLastGlyph(glyph: IDocumentSkeletonGlyph, sectionBreakConfig: ISectionBreakConfig, paragraphStyle: IDocumentLayoutParagraphStyle): {
     documentCompatibilityPolicy: IDocumentCompatibilityPolicy;
     fontStyle: IDocumentSkeletonFontStyle;
-    textStyle: ITextStyle;
+    textStyle: IDocumentLayoutTextStyle;
+    balanceSingleByteDoubleByteWidth: BooleanNumber | undefined;
     charSpace: number;
     gridType: GridType;
     snapToGrid: BooleanNumber;
     pageWidth: number;
 };
-export declare function getFontCreateConfig(index: number, viewModel: DocumentViewModel, paragraphNode: DataStreamTreeNode, sectionBreakConfig: ISectionBreakConfig, paragraph: IParagraph): IFontCreateConfig;
+export declare function getFontCreateConfig(index: number, viewModel: DocumentViewModel, paragraphNode: DataStreamTreeNode, sectionBreakConfig: ISectionBreakConfig, paragraph: IDocumentLayoutParagraph): 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
@@ -214,6 +220,7 @@ export interface IFloatObject {
     angle: number;
     behindDoc?: BooleanNumber;
     layoutType?: PositionedObjectLayoutType;
+    effectExtent?: IDocDrawingBase['effectExtent'];
     type: FloatObjectType;
     positionV: IObjectPositionV;
 }
@@ -239,7 +246,7 @@ export interface ILayoutContext {
     endnoteLayout?: DocumentEndnoteLayout;
     /** Virtual marker in a note body; it never consumes a persisted character. */
     noteLabel?: string;
-    noteReferenceTextStyle?: ITextStyle;
+    noteReferenceTextStyle?: IDocumentLayoutTextStyle;
     /** Preserve the local note segment when the paragraph/table pipeline opens a continuation page. */
     noteSegmentId?: string;
     footnoteFirstColumn?: {
@@ -249,6 +256,8 @@ export interface ILayoutContext {
     viewModel: DocumentViewModel;
     dataModel: DocumentDataModel;
     docsConfig: IDocsConfig;
+    modernPageWidth?: number;
+    modernHorizontalMargin?: number;
     skeleton: IDocumentSkeletonCached;
     layoutStartPointer: Record<string, Nullable<number>>;
     isDirty: boolean;

package/lib/types/components/docs/page-borders.d.ts

@@ -0,0 +1,20 @@
+/**
+ * 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 { IPageBorders } from '@univerjs/core';
+import type { IDocumentSkeletonPage } from '../../basics/i-document-skeleton-cached';
+import type { UniverRenderingContext } from '../../context';
+/** Draws section page borders without contributing to text/table layout. */
+export declare function drawPageBorders(ctx: UniverRenderingContext, page: IDocumentSkeletonPage, borders: IPageBorders | undefined, pageLeft: number, pageTop: number, firstPageInSection: boolean): void;

package/lib/types/components/docs/table-hit-test.d.ts

@@ -0,0 +1,16 @@
+/**
+ * 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 declare function getTopmostDocsTableHit<T>(tables: readonly T[], hitBody: (table: T) => boolean, hitControls: (table: T) => boolean, isNestedTable?: (outer: T, inner: T) => boolean): T | undefined;

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

@@ -13,6 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import type { DocumentFlavor } from '@univerjs/core';
+import type { IDocumentSkeletonPage } from '../../basics/i-document-skeleton-cached';
+/** Shared by the canvas renderer and interactive table viewport provider. */
+export declare function getDocsTableLayoutViewportWidth(page: Pick<IDocumentSkeletonPage, 'pageWidth' | 'marginLeft' | 'marginRight'> & Partial<Pick<IDocumentSkeletonPage, 'type'>>, tableLeft: number, tableSource: unknown, documentFlavor?: DocumentFlavor): number;
 export interface IDocsTableRenderViewport {
     contentWidth: number;
     leadingInsetLeft?: number;

package/lib/types/components/docs/view-model/data-stream-tree-node.d.ts

@@ -25,6 +25,7 @@ export declare class DataStreamTreeNode {
     blocks: number[];
     constructor(nodeType: DataStreamTreeNodeType, content?: string | undefined);
     static create(nodeType: DataStreamTreeNodeType, content?: string): DataStreamTreeNode;
+    get contentStartIndex(): number;
     dispose(): void;
     getProps(): {
         children: DataStreamTreeNode[];

package/lib/types/components/docs/view-model/document-view-model.d.ts

@@ -13,7 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { DocumentDataModel, IColumnGroup, ICustomBlock, ICustomColumnGroup, ICustomDecorationForInterceptor, ICustomRangeForInterceptor, ICustomTable, IDisposable, IParagraph, ISectionBreak, ITable, ITextRun, JSONXActions, Nullable } from '@univerjs/core';
+import type { DocumentDataModel, ICustomBlock, ICustomDecorationForInterceptor, ICustomRangeForInterceptor, ICustomTable, IDisposable, ITable, JSONXActions, Nullable } from '@univerjs/core';
+import type { IDocumentLayoutBody, IDocumentLayoutColumnGroup, IDocumentLayoutCustomColumnGroup, IDocumentLayoutParagraph, IDocumentLayoutSectionBreak, IDocumentLayoutSnapshot, IDocumentLayoutTextRun } from '../document-layout-presentation';
 import { DataStreamTreeNode } from './data-stream-tree-node';
 interface ITableNodeCache {
     table: DataStreamTreeNode;
@@ -36,8 +37,8 @@ interface ITableCoupleCache {
     tableSource: ITable;
 }
 interface IColumnGroupCoupleCache {
-    columnGroup: ICustomColumnGroup;
-    columnGroupSource: IColumnGroup;
+    columnGroup: IDocumentLayoutCustomColumnGroup;
+    columnGroupSource: IDocumentLayoutColumnGroup;
 }
 export declare class DocumentViewModel implements IDisposable {
     private _documentDataModel;
@@ -82,16 +83,16 @@ export declare class DocumentViewModel implements IDisposable {
     getEditArea(): DocumentEditArea;
     setEditArea(editArea: DocumentEditArea): void;
     getChildren(): DataStreamTreeNode[];
-    getBody(): import("@univerjs/core").IDocumentBody | undefined;
-    getSnapshot(): import("@univerjs/core").IDocumentData;
+    getBody(): IDocumentLayoutBody | undefined;
+    getSnapshot(): IDocumentLayoutSnapshot;
     getDataModel(): DocumentDataModel;
     getSelfOrHeaderFooterViewModel(segmentId?: string): DocumentViewModel;
     reset(documentDataModel: DocumentDataModel): void;
     resetByValidatedTextMutation(documentDataModel: DocumentDataModel, actions: JSONXActions): boolean;
     resetByValidatedMetadataMutation(documentDataModel: DocumentDataModel, actions: JSONXActions): boolean;
-    getSectionBreak(index: number): ISectionBreak | undefined;
-    getParagraph(index: number): IParagraph | undefined;
-    getTextRun(index: number): Nullable<ITextRun>;
+    getSectionBreak(index: number): IDocumentLayoutSectionBreak | undefined;
+    getParagraph(index: number): IDocumentLayoutParagraph | undefined;
+    getTextRun(index: number): Nullable<IDocumentLayoutTextRun>;
     getCustomBlock(index: number): ICustomBlock | undefined;
     getCustomBlockWithoutSetCurrentIndex(index: number): ICustomBlock | undefined;
     getTableByStartIndex(index: number): ITableCoupleCache | undefined;

package/lib/types/components/extension.d.ts

@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { IDocumentRenderConfig, IRange, IScale, Nullable } from '@univerjs/core';
+import type { IRange, IScale, Nullable } from '@univerjs/core';
 import type { BaseObject } from '../base-object';
 import type { IBoundRectNoAngle, Vector2 } from '../basics/vector2';
 import type { UniverRenderingContext } from '../context';
+import type { IDocumentLayoutRenderConfig } from './docs/document-layout-presentation';
 import { Registry } from '@univerjs/core';
 export interface IExtensionConfig {
     originTranslate?: Vector2;
@@ -24,7 +25,7 @@ export interface IExtensionConfig {
     spanPointWithFont?: Vector2;
     centerPoint?: Vector2;
     alignOffset?: Vector2;
-    renderConfig?: IDocumentRenderConfig;
+    renderConfig?: IDocumentLayoutRenderConfig;
 }
 export interface IDrawInfo {
     viewRanges: IRange[];

package/lib/types/components/sheets/extensions/sheet-extension.d.ts

@@ -17,7 +17,8 @@ import type { IRange } from '@univerjs/core';
 import type { SpreadsheetSkeleton } from '../sheet.render-skeleton';
 import { ComponentExtension } from '../../extension';
 export declare enum SHEET_EXTENSION_TYPE {
-    GRID = 0
+    BACKGROUND = 0,
+    GRID = 1
 }
 /**
  * for distinguish doc & slides extensions, now only used when metric performance.

package/lib/types/components/sheets/sheet.render-skeleton.d.ts

@@ -39,8 +39,10 @@ export declare const DEFAULT_PADDING_DATA: {
     r: number;
 };
 export declare const RENDER_RAW_FORMULA_KEY = "RENDER_RAW_FORMULA";
+export declare const FULL_WIDTH_HORIZONTAL_ALIGNMENTS: Set<HorizontalAlign>;
 export declare function getShrinkToFitScale(contentWidth: number, availableWidth: number, fontSize: number): number;
 export declare function getGeneralNumberDisplayText(value: number, displayText: string, fontString: string, availableWidth: number): string;
+export declare function getCustomNumberDisplayText(displayText: string, fontString: string, availableWidth: number): string;
 export declare function scaleDocumentDataForShrinkToFit(documentData: IDocumentData, scale: number, fallbackFontSize: number): IDocumentData;
 export interface ICacheItem {
     bg: boolean;
@@ -185,7 +187,7 @@ export declare class SpreadsheetSkeleton extends SheetSkeleton {
     _setBorderStylesCache(row: number, col: number, style: Nullable<IStyleData>, options: ISetStylesCacheForOneCellOptions | undefined): void;
     _setBgStylesCache(row: number, col: number, style: Nullable<IStyleData>, options: ISetStylesCacheForOneCellOptions | undefined): void;
     private _applyShrinkToFit;
-    private _applyGeneralNumberDisplay;
+    private _applyNumberDisplay;
     _setFontStylesCache(row: number, col: number, cellData: Nullable<ICellDataForSheetInterceptor>, style: IStyleData, hasMergeData?: boolean): void;
     /**
      * Set border background and font to this._stylesCache cell by cell.

package/lib/types/index.d.ts

@@ -24,11 +24,14 @@ export * from './canvas';
 export * from './components';
 export type { DocsCustomBlockRenderViewportProvider, IDocsCustomBlockRenderViewport, IDocsCustomBlockRenderViewportInput } from './components/docs/custom-block-render-viewport';
 export { getDocsCustomBlockRenderViewport, setDocsCustomBlockRenderViewportProvider } from './components/docs/custom-block-render-viewport';
+export { getDocCustomGlyphRenderer, registerDocCustomGlyphRenderer, } from './components/docs/custom-glyph-renderer';
+export type { DocCustomGlyphRenderer, IDocCustomGlyphRendererRegistration, IDocCustomGlyphRenderInput, } from './components/docs/custom-glyph-renderer';
 export { DocBackground } from './components/docs/doc-background';
 export { DOCS_EXTENSION_TYPE } from './components/docs/doc-extension';
 export { Documents } from './components/docs/document';
-export type { IPageRenderConfig } from './components/docs/document';
-export type { IDocumentOffsetConfig } from './components/docs/document';
+export type { IDocumentGlyphPaint, IDocumentOffsetConfig, IPageRenderConfig } from './components/docs/document';
+export { getDocumentLayoutPresentation, registerDocumentLayoutPresentation } from './components/docs/document-layout-presentation';
+export type { IDocumentLayoutBody, IDocumentLayoutParagraph, IDocumentLayoutParagraphStyle, IDocumentLayoutPresentation, IDocumentLayoutSnapshot, IDocumentLayoutTextRun, IDocumentLayoutTextStyle, } from './components/docs/document-layout-presentation';
 export { getTableIdAndSliceIndex } from './components/docs/layout/block/table';
 export { measureDocumentNoWrapTextRangeWidth, measureDocumentNoWrapTextWidth, measureDocumentUnbreakableTextWidth, measureDocumentWrappedTextWidth, } from './components/docs/layout/doc-no-wrap-measure';
 export * from './components/docs/layout/doc-simple-skeleton';
@@ -41,8 +44,9 @@ export { compareDocumentSkeletonNestedPagePathOrder, documentSkeletonLineIterato
 export type { IDocumentSkeletonColumnPagePathInfo, IDocumentSkeletonLineContext, IDocumentSkeletonLineIteratorOptions, IDocumentSkeletonTableCellGeometry, IDocumentSkeletonTableContext, IDocumentSkeletonTableIteratorOptions } from './components/docs/layout/tools';
 export { getLastColumn } from './components/docs/layout/tools';
 export { Liquid } from './components/docs/liquid';
+export { getTopmostDocsTableHit } from './components/docs/table-hit-test';
 export type { DocsTableRenderViewportProvider, IDocsTableRenderViewport, } from './components/docs/table-render-viewport';
-export { getDocsTableRenderViewport, getDocsTableViewportLeft, setDocsTableRenderViewportProvider, } from './components/docs/table-render-viewport';
+export { getDocsTableLayoutViewportWidth, getDocsTableRenderViewport, getDocsTableViewportLeft, setDocsTableRenderViewportProvider, } from './components/docs/table-render-viewport';
 export { DataStreamTreeNode } from './components/docs/view-model/data-stream-tree-node';
 export { DocumentViewModel } from './components/docs/view-model/document-view-model';
 export { DocumentEditArea } from './components/docs/view-model/document-view-model';

package/lib/types/scene-viewer.d.ts

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 import type { Nullable } from '@univerjs/core';
+import type { DeviceType } from './basics/i-events';
 import type { IObjectFullState } from './basics/interfaces';
 import type { IViewportInfo, Vector2 } from './basics/vector2';
 import type { UniverRenderingContext } from './context';
@@ -36,7 +37,7 @@ export declare class SceneViewer extends BaseObject {
     enableSelectedClipElement(): void;
     disableSelectedClipElement(): void;
     allowSelectedClipElement(): boolean;
-    pick(coord: Vector2): Nullable<BaseObject | Scene>;
+    pick(coord: Vector2, deviceType?: DeviceType): Nullable<BaseObject | Scene>;
     dispose(): void;
     private _initialProps;
 }

package/lib/types/scene.d.ts

@@ -26,6 +26,7 @@ import type { SceneViewer } from './scene-viewer';
 import type { Viewport } from './viewport';
 import { Disposable, EventSubject } from '@univerjs/core';
 import { CURSOR_TYPE, RENDER_CLASS_TYPE } from './basics/const';
+import { DeviceType } from './basics/i-events';
 import { Transform } from './basics/transform';
 import { Layer } from './layer';
 import { Transformer } from './scene.transformer';
@@ -293,7 +294,7 @@ export declare class Scene extends Disposable {
      * @param {Vector2} coord
      * @return {Nullable<BaseObject | Scene>} object under the pointer
      */
-    pick(coord: Vector2): Nullable<BaseObject | Scene>;
+    pick(coord: Vector2, deviceType?: DeviceType): Nullable<BaseObject | Scene>;
     triggerPointerUp(evt: IPointerEvent | IMouseEvent): boolean;
     triggerMouseWheel(evt: IWheelEvent): boolean;
     triggerSingleClick(evt: IPointerEvent | IMouseEvent): boolean;

package/lib/types/scene.input-manager.d.ts

@@ -41,6 +41,7 @@ export declare class InputManager extends Disposable {
     private _delayedTripeTimeout;
     private _doubleClickOccurred;
     private _tripleClickState;
+    private _lastClickTime;
     private _currentObject;
     constructor(scene: Scene);
     /**
@@ -74,6 +75,7 @@ export declare class InputManager extends Disposable {
      * @param offsetY
      */
     private _getObjectAtPos;
+    private _getObjectAtEvent;
     /**
      *
      * If currentObject is null, return true

package/lib/types/scene.transformer.d.ts

@@ -42,11 +42,13 @@ export interface IChangeObserverConfig {
  */
 export declare class Transformer extends Disposable implements ITransformerConfig {
     private _scene;
+    private static readonly _selectionTapMovementThreshold;
     isCropper: boolean;
     hoverEnabled: boolean;
     hoverEnterFunc: Nullable<(e: IPointerEvent | IMouseEvent) => void>;
     hoverLeaveFunc: Nullable<(e: IPointerEvent | IMouseEvent) => void>;
     moveEnabled: boolean;
+    moveOnlyWhenSelected: boolean;
     resizeEnabled: boolean;
     rotateEnabled: boolean;
     rotationSnaps: number[];
@@ -118,8 +120,7 @@ export declare class Transformer extends Disposable implements ITransformerConfi
     private _startStateMap;
     private _viewportScrollX;
     private _viewportScrollY;
-    private _topScenePointerMoveSub;
-    private _topScenePointerUpSub;
+    private _finishGesture;
     private _cancelFocusSubscription;
     private _transformerControlMap;
     private _selectedObjectMap;
@@ -132,6 +133,9 @@ export declare class Transformer extends Disposable implements ITransformerConfi
     updateZeroPoint(left: number, top: number): void;
     changeNotification(): this;
     getSelectedObjectMap(): Map<string, BaseObject>;
+    /** Complete the current object transform before another gesture takes ownership of the scene. */
+    finishTransform(): void;
+    private _bindGestureEnd;
     resetProps(config?: ITransformerConfig): void;
     getScene(): Scene;
     clearControls(changeSelf?: boolean): void;

package/lib/types/shape/control.d.ts

@@ -13,5 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export declare class Control {
+import { Vector2 } from '../basics/vector2';
+import { Rect } from './rect';
+/** A precise mouse handle with a zoom-independent touch target. */
+export declare class Control extends Rect {
+    getTouchHitDistance(coord: Vector2): number;
 }

package/lib/types/worker-layout.d.ts

@@ -24,11 +24,19 @@ export interface IDocumentLayoutSessionStartOptions {
     priorityAnchor?: number;
     invalidation?: IDocumentLayoutInvalidation;
     waitForHyphenationPatterns?: boolean;
+    modernPageWidth?: number;
+    modernHorizontalMargin?: number;
 }
 export interface IDocumentLayoutStepResult {
     progress: IDocumentLayoutProgress;
     publication: IDocumentLayoutGeometryPublication | null;
 }
+export interface IDocumentLayoutPageResolution {
+    pageIndex: number;
+    pageNumber: number;
+    startOffset: number;
+    endOffset: number;
+}
 /**
  * Worker-safe owner of the document view model and incremental layout state.
  * Scheduling, transport, presentation and model revision ordering belong to callers.
@@ -50,6 +58,7 @@ export declare class DocumentLayoutSession extends Disposable {
     step(generation: number, budgetMs?: number, maxWorkUnits?: number): IDocumentLayoutStepResult;
     publishBacklog(generation: number): IDocumentLayoutStepResult;
     getPage(pageIndex: number): IDocumentLayoutPagePublication | null;
+    resolvePageByOffset(offset: number): IDocumentLayoutPageResolution | null;
     cancel(generation?: number): void;
     resetDataModel(dataModel: DocumentDataModel): void;
     getProgress(): Nullable<IDocumentLayoutProgress>;