@univerjs/engine-render 0.25.1 → 1.0.0-alpha.1

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

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

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { BulletAlignment, ColumnSeparatorType, DataStreamTreeTokenType, IDocDrawingBase, IDocumentRenderConfig, INestingLevel, IParagraph, IParagraphBorder, IParagraphProperties, ITable, ITableRow, ITextStyle, PageOrientType } from '@univerjs/core';
+import type { BulletAlignment, ColumnSeparatorType, DataStreamTreeTokenType, IColorStyle, IColumnGroup, IDocDrawingBase, IDocumentRenderConfig, INestingLevel, IParagraph, IParagraphBorder, IParagraphProperties, ITable, ITableRow, ITextStyle, PageOrientType } from '@univerjs/core';
 import type { BreakPointType } from '../components/docs/layout/line-breaker/break';
 export interface IDocumentSkeletonCached extends ISkeletonResourceReference {
     pages: IDocumentSkeletonPage[];
@@ -69,6 +69,7 @@ export interface IDocumentSkeletonPage {
     ed: number;
     skeDrawings: Map<string, IDocumentSkeletonDrawing>;
     skeTables: Map<string, IDocumentSkeletonTable>;
+    skeColumnGroups: Map<string, IDocumentSkeletonColumnGroup>;
     segmentId: string;
     type: DocumentSkeletonPageType;
     renderConfig?: IDocumentRenderConfig;
@@ -108,6 +109,29 @@ export interface IDocumentSkeletonRow {
     parent?: IDocumentSkeletonTable;
     isRepeatRow: boolean;
 }
+export interface IDocumentSkeletonColumnGroup {
+    columns: IDocumentSkeletonColumnGroupColumn[];
+    width: number;
+    height: number;
+    top: number;
+    left: number;
+    st: number;
+    ed: number;
+    columnGroupId: string;
+    columnGroupSource: IColumnGroup;
+    parent?: IDocumentSkeletonPage;
+}
+export interface IDocumentSkeletonColumnGroupColumn {
+    columnId: string;
+    left: number;
+    top: number;
+    width: number;
+    height: number;
+    st: number;
+    ed: number;
+    page: IDocumentSkeletonPage;
+    parent?: IDocumentSkeletonColumnGroup;
+}
 export interface IDocumentSkeletonColumn {
     lines: IDocumentSkeletonLine[];
     left: number;
@@ -143,6 +167,7 @@ export interface IDocumentSkeletonLine {
     isBehindTable: boolean;
     tableId: string;
     borderBottom?: IParagraphBorder;
+    backgroundColor?: IColorStyle;
     bullet?: IDocumentSkeletonBullet;
     width?: number;
     parent?: IDocumentSkeletonColumn;

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

@@ -15,6 +15,7 @@
  */
 import type { BooleanNumber, GridType, IDocStyleBase, IDocumentLayout, IOffset, IParagraphStyle, IReferenceSource, IScale, ISectionBreakBase, ISize, ITextStyle, ITransformState, LocaleService } from '@univerjs/core';
 import type { DataStreamTreeNode } from '../components/docs/view-model/data-stream-tree-node';
+import type { IDocumentCompatibilityPolicy } from '../components/docs/document-compatibility';
 import type { DocumentViewModel } from '../components/docs/view-model/document-view-model';
 import type { DocumentSkeletonPageType, IDocumentSkeletonBullet, IDocumentSkeletonDrawing, IDocumentSkeletonDrawingAnchor, IDocumentSkeletonFontStyle, IDocumentSkeletonGlyph, IDocumentSkeletonHeaderFooter, IDocumentSkeletonTable } from './i-document-skeleton-cached';
 import type { ITransformerConfig } from './transformer-config';
@@ -61,6 +62,7 @@ export interface IFontLocale {
 export interface IDocsConfig extends IReferenceSource, IDocumentLayout {
     localeService: LocaleService;
     documentTextStyle?: ITextStyle;
+    documentCompatibilityPolicy?: IDocumentCompatibilityPolicy;
     headerTreeMap: Map<string, DocumentViewModel>;
     footerTreeMap: Map<string, DocumentViewModel>;
 }
@@ -89,6 +91,9 @@ export interface IParagraphTableCache {
 }
 export interface IParagraphConfig {
     paragraphIndex: number;
+    documentCompatibilityPolicy?: IDocumentCompatibilityPolicy;
+    useWordStyleLineHeight?: boolean;
+    docxFallbackAnchorLeft?: IParagraphStyle['indentStart'];
     paragraphNonInlineSkeDrawings?: Map<string, IDocumentSkeletonDrawing>;
     paragraphInlineSkeDrawings?: Map<string, IDocumentSkeletonDrawing>;
     skeTablesInParagraph?: IParagraphTableCache[];
@@ -103,6 +108,7 @@ export interface IFontCreateConfig {
     textStyle: ITextStyle;
     charSpace: number;
     snapToGrid: BooleanNumber;
+    documentCompatibilityPolicy?: IDocumentCompatibilityPolicy;
     gridType?: GridType;
     pageWidth?: number;
 }

package/lib/types/basics/transformer-config.d.ts

@@ -25,8 +25,16 @@ export interface ITransformerConfig {
     rotationSnaps?: number[];
     rotationSnapTolerance?: number;
     rotateAnchorOffset?: number;
+    rotateAnchorPosition?: 'top' | 'bottom';
+    rotateLineEnabled?: boolean;
     rotateSize?: number;
     rotateCornerRadius?: number;
+    rotateFill?: string;
+    rotateStroke?: string;
+    rotateStrokeWidth?: number;
+    rotateIconEnabled?: boolean;
+    rotateIconStroke?: string;
+    rotateIconStrokeWidth?: number;
     borderEnabled?: boolean;
     borderStroke?: string;
     borderStrokeWidth?: number;
@@ -39,6 +47,14 @@ export interface ITransformerConfig {
     anchorStrokeWidth?: number;
     anchorSize?: number;
     anchorCornerRadius?: number;
+    anchorStyle?: 'default' | 'canva';
+    anchorSideLongSize?: number;
+    anchorSideShortSize?: number;
+    anchorSideCornerRadius?: number;
+    anchorShadowColor?: string;
+    anchorShadowBlur?: number;
+    anchorShadowOffsetX?: number;
+    anchorShadowOffsetY?: number;
     keepRatio?: boolean;
     centeredScaling?: boolean;
     flipEnabled?: boolean;
@@ -48,4 +64,5 @@ export interface ITransformerConfig {
     shouldOverdrawWholeArea?: boolean;
     zeroLeft?: number;
     zeroTop?: number;
+    moveBoundaryEnabled?: boolean;
 }

package/lib/types/components/docs/doc-background.d.ts

@@ -24,11 +24,15 @@ export declare class DocBackground extends DocComponent {
     private _pageFillColor?;
     private _pageStrokeColor?;
     private _marginStrokeColor?;
+    private _pageBackgroundSource?;
+    private _pageBackgroundImage?;
     constructor(oKey: string, documentSkeleton?: DocumentSkeleton, config?: IDocumentsConfig);
     static create(oKey: string, documentSkeleton?: DocumentSkeleton, config?: IDocumentsConfig): DocBackground;
     setFillColors(backgroundFillColor?: string, pageFillColor?: string, pageStrokeColor?: string, marginStrokeColor?: string): void;
     draw(ctx: UniverRenderingContext, bounds?: IViewportInfo): void;
     private _drawWorkspaceBackground;
+    private _drawPageBackgroundImage;
+    private _getPageBackgroundImage;
     changeSkeleton(newSkeleton: DocumentSkeleton): this;
     protected _draw(ctx: UniverRenderingContext, bounds?: IViewportInfo): void;
 }

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

@@ -0,0 +1,43 @@
+/**
+ * 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 { ITable } from '@univerjs/core';
+import type { IDocumentSkeletonBoundingBox, IDocumentSkeletonFontStyle } from '../../basics/i-document-skeleton-cached';
+import { DocumentFlavor } from '@univerjs/core';
+interface IFontMetricScaleRule {
+    fontFamily: RegExp;
+    minFontSize?: number;
+    fontString?: RegExp;
+    content?: RegExp;
+    widthScale?: number;
+}
+export interface IDocumentCompatibilityPolicy {
+    mode: 'modern' | 'traditional' | 'unspecified';
+    applyDocumentDefaultParagraphStyle: boolean;
+    useWordStyleLineHeight: boolean;
+    font: {
+        metricScaleRules: IFontMetricScaleRule[];
+    };
+    table: {
+        currentPageOverflowTolerance: number;
+        rowOverflowTolerance: number;
+        allowImportedTableMarginOverflow: boolean;
+    };
+}
+export declare function getDocumentCompatibilityPolicy(documentFlavor?: DocumentFlavor): IDocumentCompatibilityPolicy;
+export declare function applyFontMetricCompatibility(content: string, fontStyle: IDocumentSkeletonFontStyle, bBox: IDocumentSkeletonBoundingBox, policy: IDocumentCompatibilityPolicy): IDocumentSkeletonBoundingBox;
+export declare function isTraditionalDocumentCompatibility(policy: IDocumentCompatibilityPolicy): boolean;
+export declare function shouldAllowImportedTableMarginOverflow(policy: IDocumentCompatibilityPolicy, tableSource: ITable | unknown): boolean;
+export {};

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

@@ -46,10 +46,16 @@ export declare class Documents extends DocComponent {
     protected _draw(ctx: UniverRenderingContext, bounds?: IViewportInfo): void;
     draw(ctx: UniverRenderingContext, bounds?: IViewportInfo): void;
     private _drawTable;
+    private _drawColumnGroups;
+    private _drawTableCellBackgrounds;
     private _getTableViewport;
     private _getRenderUnitId;
+    private _getDocumentCompatibilityPolicy;
+    private _drawLineBackground;
     private _drawBorderBottom;
+    private _drawGlyphGroupBackgrounds;
     private _drawTableCell;
+    private _drawNestedPageContent;
     private _drawTableCellBordersAndBg;
     private _getTableCellSource;
     private _resolveTableCellBorder;

package/lib/types/components/docs/extensions/background-runs.d.ts

@@ -0,0 +1,22 @@
+/**
+ * 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 { IDocumentSkeletonGlyph } from '../../../basics/i-document-skeleton-cached';
+export interface IBackgroundGlyphRun {
+    glyph: IDocumentSkeletonGlyph;
+    left: number;
+    width: number;
+}
+export declare function collectBackgroundGlyphRuns(glyphGroup: IDocumentSkeletonGlyph[]): IBackgroundGlyphRun[];

package/lib/types/components/docs/extensions/font-and-base-line.d.ts

@@ -32,8 +32,18 @@ export declare class FontAndBaseLine extends docExtension {
      * so we need a map to store actual value and set value
      */
     actualFontMap: Record<string, string>;
+    private _textFillImageCache;
     constructor();
     draw(ctx: UniverRenderingContext, _parentScale: IScale, glyph: IDocumentSkeletonGlyph, _?: IBoundRectNoAngle, _more?: IDrawInfo): void;
+    private _fillTextWithTextFill;
+    private _getGlyphPaintBounds;
+    private _createTextGradient;
+    private _createTextPicturePattern;
+    private _getTextFillImage;
+    private _normalizeGradientStops;
+    private _getLinearGradientLine;
+    private _colorWithOpacity;
+    private _clamp;
     private _fillText;
     clearCache(): void;
 }

package/lib/types/components/docs/layout/block/column.d.ts

@@ -0,0 +1,23 @@
+/**
+ * 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 { Nullable } from '@univerjs/core';
+import type { IDocumentSkeletonColumnGroup, IDocumentSkeletonPage } 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';
+export declare function createColumnGroupSkeleton(ctx: ILayoutContext, curPage: IDocumentSkeletonPage, viewModel: DocumentViewModel, columnGroupNode: DataStreamTreeNode, sectionBreakConfig: ISectionBreakConfig): Nullable<IDocumentSkeletonColumnGroup>;
+export declare function appendColumnGroupBlockLine(page: IDocumentSkeletonPage, columnGroup: IDocumentSkeletonColumnGroup): boolean;

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

@@ -13,9 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { IDocumentSkeletonDrawing, IDocumentSkeletonGlyph, IDocumentSkeletonLine, IDocumentSkeletonPage } from '../../../../../basics/i-document-skeleton-cached';
+import type { IDocumentSkeletonColumn, IDocumentSkeletonDrawing, IDocumentSkeletonGlyph, IDocumentSkeletonLine, IDocumentSkeletonPage, IDocumentSkeletonTable } from '../../../../../basics/i-document-skeleton-cached';
 import type { IParagraphConfig, ISectionBreakConfig } from '../../../../../basics/interfaces';
-import type { ILayoutContext } from '../../tools';
+import type { IFloatObject, ILayoutContext } from '../../tools';
+import { BooleanNumber, GridType, SpacingRule } from '@univerjs/core';
 import { BreakPointType } from '../../line-breaker/break';
 export declare function layoutParagraph(ctx: ILayoutContext, glyphGroup: IDocumentSkeletonGlyph[], pages: IDocumentSkeletonPage[], sectionBreakConfig: ISectionBreakConfig, paragraphConfig: IParagraphConfig, isParagraphFirstShapedText: boolean, breakPointType?: BreakPointType): IDocumentSkeletonPage[];
-export declare function updateInlineDrawingPosition(line: IDocumentSkeletonLine, paragraphInlineSkeDrawings?: Map<string, IDocumentSkeletonDrawing>, blockAnchorTop?: number): void;
+declare function __avoidFlowAffectingDrawingsForTable(table: IDocumentSkeletonTable, page: IDocumentSkeletonPage, column: IDocumentSkeletonColumn): void;
+declare function _reLayoutCheck(ctx: ILayoutContext, floatObjects: IFloatObject[], column: IDocumentSkeletonColumn, paragraphIndex: number): void;
+export declare const __testing: {
+    reLayoutCheck: typeof _reLayoutCheck;
+    avoidFlowAffectingDrawingsForTable: typeof __avoidFlowAffectingDrawingsForTable;
+};
+export declare function getLineHeightMetrics(glyphLineHeight: number, paragraphLineGapDefault: number, linePitch: number, gridType: GridType, lineSpacing: number, spacingRule: SpacingRule, snapToGrid: BooleanNumber, useWordStyleLineHeight?: boolean, scaleAutoLineSpacingByGlyphHeight?: boolean): {
+    paddingTop: number;
+    paddingBottom: number;
+    contentHeight: number;
+    lineSpacingApply: number;
+};
+export declare function updateInlineDrawingPosition(line: IDocumentSkeletonLine, paragraphInlineSkeDrawings?: Map<string, IDocumentSkeletonDrawing>, blockAnchorTop?: number, paragraphNonInlineSkeDrawings?: Map<string, IDocumentSkeletonDrawing>): void;
+export {};

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

@@ -29,7 +29,7 @@ interface ILineBoundingBox {
     spaceBelowApply?: number;
 }
 export declare function createSkeletonLine(paragraphIndex: number, lineType: LineType, lineBoundingBox: ILineBoundingBox, columnWidth: number, lineIndex: number | undefined, isParagraphStart: boolean | undefined, paragraphConfig: IParagraphConfig, page: IDocumentSkeletonPage, headerPage: Nullable<IDocumentSkeletonPage>, footerPage: Nullable<IDocumentSkeletonPage>): IDocumentSkeletonLine;
-export declare function calculateLineTopByDrawings(lineHeight: number | undefined, lineTop: number | undefined, page: IDocumentSkeletonPage, headerPage: Nullable<IDocumentSkeletonPage>, footerPage: Nullable<IDocumentSkeletonPage>): number;
+export declare function calculateLineTopByDrawings(lineHeight: number | undefined, lineTop: number | undefined, page: IDocumentSkeletonPage, headerPage: Nullable<IDocumentSkeletonPage>, footerPage: Nullable<IDocumentSkeletonPage>, columnLeft?: number, columnWidth?: number): number;
 export declare function updateDivideInfo(divide: IDocumentSkeletonDivide, states: Partial<IDocumentSkeletonDivide>): void;
 export declare function setLineMarginBottom(line: IDocumentSkeletonLine, marginBottom: number): void;
 export declare function collisionDetection(floatObject: IFloatObject, lineHeight: number, lineTop: number, columnLeft: number, columnWidth: number): boolean;

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { ITable } from '@univerjs/core';
+import type { IDocumentBody, ITable, 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';
@@ -27,3 +27,4 @@ export declare function createNullCellPage(ctx: ILayoutContext, sectionBreakConf
 };
 export declare function createSkeletonCellPages(ctx: ILayoutContext, viewModel: DocumentViewModel, cellNode: DataStreamTreeNode, sectionBreakConfig: ISectionBreakConfig, tableConfig: ITable, row: number, col: number, availableHeight?: number, maxCellPageHeight?: number): IDocumentSkeletonPage[];
 export declare function expandCellPageHeightForInlineDrawings(pages: IDocumentSkeletonPage[]): void;
+export declare function applyTrailingBlockRangeSpaceBelow(pages: IDocumentSkeletonPage[], body: Nullable<IDocumentBody>, containerEndIndex: number): void;

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

@@ -13,9 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { DocumentDataModel, INumberUnit, IObjectPositionH, IObjectPositionV, IParagraph, IParagraphStyle, ITextStyle, Nullable } from '@univerjs/core';
-import type { IDocumentSkeletonCached, IDocumentSkeletonColumn, IDocumentSkeletonDivide, IDocumentSkeletonFontStyle, IDocumentSkeletonGlyph, IDocumentSkeletonLine, IDocumentSkeletonPage, IDocumentSkeletonSection, ISkeletonResourceReference } from '../../../basics/i-document-skeleton-cached';
+import type { DocumentDataModel, 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';
+import type { IDocumentCompatibilityPolicy } from '../document-compatibility';
 import type { DataStreamTreeNode } from '../view-model/data-stream-tree-node';
 import type { DocumentViewModel } from '../view-model/document-view-model';
 import type { Hyphen } from './hyphenation/hyphen';
@@ -55,6 +57,7 @@ export declare function getLineHeightConfig(sectionBreakConfig: ISectionBreakCon
     lineSpacing: number;
     spacingRule: SpacingRule;
     snapToGrid: BooleanNumber;
+    useWordStyleLineHeight: boolean;
 };
 export declare function getCharSpaceConfig(sectionBreakConfig: ISectionBreakConfig, paragraphConfig: IParagraphConfig): {
     charSpace: number;
@@ -63,10 +66,85 @@ export declare function getCharSpaceConfig(sectionBreakConfig: ISectionBreakConf
     gridType: GridType;
     snapToGrid: BooleanNumber;
 };
-export declare function updateBlockIndex(pages: IDocumentSkeletonPage[], start?: number): void;
+export declare function updateBlockIndex(pages: IDocumentSkeletonPage[], start?: number, documentCompatibilityPolicy?: IDocumentCompatibilityPolicy): void;
 export declare function updateInlineDrawingCoordsAndBorder(ctx: ILayoutContext, pages: IDocumentSkeletonPage[]): void;
 export declare function glyphIterator(pages: IDocumentSkeletonPage[], cb: (glyph: IDocumentSkeletonGlyph, divide: IDocumentSkeletonDivide, line: IDocumentSkeletonLine, column: IDocumentSkeletonColumn, section: IDocumentSkeletonSection, page: IDocumentSkeletonPage) => void): void;
 export declare function lineIterator(pagesOrCells: (IDocumentSkeletonPage)[], cb: (line: IDocumentSkeletonLine, column: IDocumentSkeletonColumn, section: IDocumentSkeletonSection, page: IDocumentSkeletonPage) => void): void;
+export type DocumentSkeletonLineSource = 'page' | 'table-cell' | 'column';
+export interface IDocumentSkeletonLineIteratorOptions {
+    docsLeft?: number;
+    pageMarginTop?: number;
+    tableCellInsetX?: number;
+    unitId?: string;
+}
+export interface IDocumentSkeletonLineContext {
+    clipLeft?: number;
+    clipRight?: number;
+    column: IDocumentSkeletonColumn;
+    line: IDocumentSkeletonLine;
+    lineWidth: number;
+    page: IDocumentSkeletonPage;
+    pageIndex: number;
+    pageLeft: number;
+    section: IDocumentSkeletonSection;
+    sectionTop: number;
+    source: DocumentSkeletonLineSource;
+    visualLeft?: number;
+    visualWidth?: number;
+}
+export type DocumentSkeletonTableSource = 'page' | 'column';
+export interface IDocumentSkeletonTableCellGeometry {
+    cell: IDocumentSkeletonPage;
+    cellRect: IBoundRectNoAngle;
+    clipLeft: number;
+    clipRight: number;
+    columnIndex: number;
+    pageLeft: number;
+    pageTop: number;
+    row: IDocumentSkeletonRow;
+    rowIndex: number;
+    visualLeft: number;
+    visualWidth: number;
+}
+export interface IDocumentSkeletonTableContext {
+    cells: IDocumentSkeletonTableCellGeometry[];
+    page: IDocumentSkeletonPage;
+    pageIndex: number;
+    pageLeft: number;
+    pageTop: number;
+    rootPage: IDocumentSkeletonPage;
+    source: DocumentSkeletonTableSource;
+    table: IDocumentSkeletonTable;
+    tableId: string;
+    tableRect: IBoundRectNoAngle;
+}
+export interface IDocumentSkeletonTableIteratorOptions {
+    docsLeft?: number;
+    docsTop?: number;
+    pageMarginTop?: number;
+    resolveViewport?: boolean;
+    tableCellInsetX?: number;
+    unitId?: string;
+}
+export declare function documentSkeletonTableIterator(pages: IDocumentSkeletonPage[], options?: IDocumentSkeletonTableIteratorOptions): IDocumentSkeletonTableContext[];
+export declare function documentSkeletonLineIterator(pages: IDocumentSkeletonPage[], options: IDocumentSkeletonLineIteratorOptions, cb: (context: IDocumentSkeletonLineContext) => void): void;
+export declare function getDocumentSkeletonNestedPageOffset(page: IDocumentSkeletonPage): {
+    left: number;
+    top: number;
+} | undefined;
+export interface IDocumentSkeletonColumnPagePathInfo {
+    columnGroupId: string;
+    columnIndex: number;
+    pageIndex: number;
+}
+export declare function getDocumentSkeletonColumnPagePathInfo(position: {
+    path?: (string | number)[];
+}): IDocumentSkeletonColumnPagePathInfo | undefined;
+export declare function compareDocumentSkeletonNestedPagePathOrder(pos1: {
+    path?: (string | number)[];
+}, pos2: {
+    path?: (string | number)[];
+}): boolean | undefined;
 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;
@@ -102,6 +180,8 @@ export interface IFloatObject {
     width: number;
     height: number;
     angle: number;
+    behindDoc?: BooleanNumber;
+    layoutType?: PositionedObjectLayoutType;
     type: FloatObjectType;
     positionV: IObjectPositionV;
 }

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

@@ -15,9 +15,13 @@
  */
 export interface IDocsTableRenderViewport {
     contentWidth: number;
+    leadingInsetLeft?: number;
     scrollLeft: number;
+    trailingInsetRight?: 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 hasDocsTableHorizontalViewport(viewport: IDocsTableRenderViewport | null | undefined): viewport is IDocsTableRenderViewport;

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { DocumentDataModel, ICustomBlock, ICustomDecorationForInterceptor, ICustomRangeForInterceptor, ICustomTable, IDisposable, IParagraph, ISectionBreak, ITable, ITextRun, Nullable } from '@univerjs/core';
+import type { DocumentDataModel, IColumnGroup, ICustomBlock, ICustomColumnGroup, ICustomDecorationForInterceptor, ICustomRangeForInterceptor, ICustomTable, IDisposable, IParagraph, ISectionBreak, ITable, ITextRun, Nullable } from '@univerjs/core';
 import { DataStreamTreeNode } from './data-stream-tree-node';
 interface ITableNodeCache {
     table: DataStreamTreeNode;
@@ -35,6 +35,10 @@ interface ITableCoupleCache {
     table: ICustomTable;
     tableSource: ITable;
 }
+interface IColumnGroupCoupleCache {
+    columnGroup: ICustomColumnGroup;
+    columnGroupSource: IColumnGroup;
+}
 export declare class DocumentViewModel implements IDisposable {
     private _documentDataModel;
     private _interceptor;
@@ -44,6 +48,7 @@ export declare class DocumentViewModel implements IDisposable {
     private _sectionBreakCache;
     private _customBlockCache;
     private _tableCache;
+    private _columnGroupCache;
     private _tableNodeCache;
     private _children;
     private _editArea;
@@ -74,6 +79,7 @@ export declare class DocumentViewModel implements IDisposable {
     getCustomBlock(index: number): ICustomBlock | undefined;
     getCustomBlockWithoutSetCurrentIndex(index: number): ICustomBlock | undefined;
     getTableByStartIndex(index: number): ITableCoupleCache | undefined;
+    getColumnGroupByStartIndex(index: number): IColumnGroupCoupleCache | undefined;
     findTableNodeById(id: string): DataStreamTreeNode | undefined;
     getCustomRangeRaw(index: number): import("@univerjs/core").ICustomRange<Record<string, any>> | undefined;
     getCustomRange(index: number): Nullable<ICustomRangeForInterceptor>;
@@ -84,6 +90,7 @@ export declare class DocumentViewModel implements IDisposable {
     private _buildSectionBreakCache;
     private _buildCustomBlockCache;
     private _buildTableCache;
+    private _buildColumnGroupCache;
     private _buildTextRunsCache;
     private _buildHeaderFooterViewModel;
 }

package/lib/types/components/sheets/extensions/border.d.ts

@@ -16,7 +16,7 @@
 import type { IRange, IScale, ObjectMatrix } from '@univerjs/core';
 import type { UniverRenderingContext } from '../../../context';
 import type { IDrawInfo } from '../../extension';
-import type { BorderCache } from '../interfaces';
+import type { IBorderCache } from '../interfaces';
 import type { SpreadsheetSkeleton } from '../sheet.render-skeleton';
 import { BorderStyleTypes } from '@univerjs/core';
 import { SheetExtension } from './sheet-extension';
@@ -34,7 +34,7 @@ export declare class Border extends SheetExtension {
     preStyle: BorderStyleTypes;
     preColor: string;
     draw(ctx: UniverRenderingContext, _parentScale: IScale, spreadsheetSkeleton: SpreadsheetSkeleton, diffRanges: IRange[], { viewRanges }: IDrawInfo): void;
-    renderBorderByCell(renderBorderContext: IRenderBorderContext, row: number, col: number, borderCacheItem: BorderCache): true | undefined;
+    renderBorderByCell(renderBorderContext: IRenderBorderContext, row: number, col: number, borderCacheItem: IBorderCache): true | undefined;
     private _getOverflowExclusion;
     private _renderDoubleBorder;
     private _getSpecificCellBorder;

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

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 import type { BorderStyleTypes, HorizontalAlign, ICellDataForSheetInterceptor, ICellWithCoord, ImageCacheMap, IStyleData, Nullable, ObjectMatrix, VerticalAlign, WrapStrategy } from '@univerjs/core';
-import type { BORDER_TYPE as BORDER_LTRB } from '../../basics/const';
+import type { BORDER_TYPE } from '../../basics/const';
 import type { Canvas } from '../../canvas';
 import type { UniverRenderingContext } from '../../context';
 import type { DocumentSkeleton } from '../docs/layout/doc-skeleton';
-export interface BorderCache {
-    [key: string]: BorderCacheItem | {};
+export interface IBorderCache {
+    [key: string]: IBorderCacheItem | {};
 }
-export interface BorderCacheItem {
-    type: BORDER_LTRB;
+export interface IBorderCacheItem {
+    type: BORDER_TYPE;
     style: BorderStyleTypes;
     color: string;
 }
@@ -46,7 +46,7 @@ export interface IStylesCache {
      * Get value from getCell in skeleton and this value is used in font extension
      */
     fontMatrix: ObjectMatrix<IFontCacheItem>;
-    border?: ObjectMatrix<BorderCache>;
+    border?: ObjectMatrix<IBorderCache>;
 }
 export declare enum ShowGridlinesState {
     OFF = 0,

package/lib/types/index.d.ts

@@ -26,11 +26,12 @@ export { getTableIdAndSliceIndex } from './components/docs/layout/block/table';
 export * from './components/docs/layout/doc-simple-skeleton';
 export { DocumentSkeleton } from './components/docs/layout/doc-skeleton';
 export type { IFindNodeRestrictions } from './components/docs/layout/doc-skeleton';
-export { getCharSpaceApply, getLastLine, getNumberUnitValue, getPageFromPath, glyphIterator, lineIterator } from './components/docs/layout/tools';
+export { compareDocumentSkeletonNestedPagePathOrder, documentSkeletonLineIterator, documentSkeletonTableIterator, getCharSpaceApply, getDocumentSkeletonColumnPagePathInfo, getDocumentSkeletonNestedPageOffset, getLastLine, getNumberUnitValue, getPageFromPath, glyphIterator, lineIterator, } from './components/docs/layout/tools';
+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 type { DocsTableRenderViewportProvider, IDocsTableRenderViewport } from './components/docs/table-render-viewport';
-export { getDocsTableRenderViewport, setDocsTableRenderViewportProvider } from './components/docs/table-render-viewport';
+export type { DocsTableRenderViewportProvider, IDocsTableRenderViewport, } from './components/docs/table-render-viewport';
+export { getDocsTableRenderViewport, 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';
@@ -44,9 +45,10 @@ export * from './engine';
 export * from './group';
 export * from './layer';
 export { IRenderingEngine, UniverRenderEnginePlugin } from './plugin';
-export { getCurrentTypeOfRenderer, IRenderManagerService, RenderManagerService, withCurrentTypeOfRenderer } from './render-manager/render-manager.service';
+export { getCurrentTypeOfRenderer, IRenderManagerService, RenderManagerService, withCurrentTypeOfRenderer, } from './render-manager/render-manager.service';
 export { type RenderComponentType } from './render-manager/render-manager.service';
-export { type IRender, type IRenderContext, type IRenderModule, RenderUnit } from './render-manager/render-unit';
+export { RenderUnit } from './render-manager/render-unit';
+export type { IRender, IRenderContext, IRenderModule } from './render-manager/render-unit';
 export * from './scene';
 export * from './scene-viewer';
 export { type IChangeObserverConfig } from './scene.transformer';

package/lib/types/render-manager/render-manager.service.d.ts

@@ -34,6 +34,7 @@ export interface IRenderManagerService extends IDisposable {
     createRender(unitId: string, createUnitOptions?: ICreateUnitOptions): IRender;
     removeRender(unitId: string): void;
     /**
+     * @deprecated use getRenderUnitById instead
      * Get RenderUnit By Id, RenderUnit implements IRender
      * @param unitId
      */